From 94b4e2a8c720e88d827e343c72c531c5b6c86427 Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Tue, 19 Nov 2024 10:14:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=80=BC=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Response/AiShpDataExpenseAccountingTableResp.cs    | 10 +++++-----
 .../ServiceControllers/DataAnalysisController.cs       |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/OpenAuth.App/ServiceApp/Response/AiShpDataExpenseAccountingTableResp.cs b/OpenAuth.App/ServiceApp/Response/AiShpDataExpenseAccountingTableResp.cs
index ffc2da0..f8ad0d3 100644
--- a/OpenAuth.App/ServiceApp/Response/AiShpDataExpenseAccountingTableResp.cs
+++ b/OpenAuth.App/ServiceApp/Response/AiShpDataExpenseAccountingTableResp.cs
@@ -35,23 +35,23 @@ namespace OpenAuth.App.ServiceApp.Response
         /// <summary>
         /// 影像生产
         /// </summary>
-        public string ShpProduction { get; set; }
+        public int ShpProduction { get; set; }
         /// <summary>
         /// 解译
         /// </summary>
-        public string ShpInterpretation { get; set; }
+        public int ShpInterpretation { get; set; }
         /// <summary>
         /// 研判分析
         /// </summary>
-        public string Judgment { get; set; }
+        public int Judgment { get; set; }
         /// <summary>
         /// 图斑推送
         /// </summary>
-        public string Push { get; set; }
+        public int Push { get; set; }
         /// <summary>
         /// 费用
         /// </summary>
-        public string Cost { get; set; }
+        public double Cost { get; set; }
         /// <summary>
         /// 格式
         /// </summary>
diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/DataAnalysisController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/DataAnalysisController.cs
index b32f458..2968bff 100644
--- a/OpenAuth.WebApi/Controllers/ServiceControllers/DataAnalysisController.cs
+++ b/OpenAuth.WebApi/Controllers/ServiceControllers/DataAnalysisController.cs
@@ -47,7 +47,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <param name="endTime"></param>
         /// <returns></returns>
         [HttpGet]
-        [AllowAnonymous]
         public async Task<Response<AiShpDataExpenseAccountingTableResp>> GetAiShpDataExpenseAccountingTable(DateTime beginTime, DateTime endTime)
         {
             Response<AiShpDataExpenseAccountingTableResp> response = new Response<AiShpDataExpenseAccountingTableResp>();

From fda307fbda1872b639a0568b0f4404c47e7c9c24 Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Tue, 19 Nov 2024 10:20:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/ServiceControllers/DataAnalysisController.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/DataAnalysisController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/DataAnalysisController.cs
index 2968bff..4f26f1b 100644
--- a/OpenAuth.WebApi/Controllers/ServiceControllers/DataAnalysisController.cs
+++ b/OpenAuth.WebApi/Controllers/ServiceControllers/DataAnalysisController.cs
@@ -22,7 +22,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <summary>
         /// 小组或人员统计
         /// </summary>
-        /// <param name="type">1-小组，2-人员</param>
+        /// <param name="type">2-小组，1-人员</param>
         /// <param name="dateType">1-本月，2-本周，3-本日</param>
         /// <returns></returns>
         [HttpGet]

From 288ed6e38524b50ee44d2b35df50a889a4aab574 Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Tue, 19 Nov 2024 10:29:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/ServiceApp/DataAnalysisApp.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenAuth.App/ServiceApp/DataAnalysisApp.cs b/OpenAuth.App/ServiceApp/DataAnalysisApp.cs
index 1b03deb..ec354f4 100644
--- a/OpenAuth.App/ServiceApp/DataAnalysisApp.cs
+++ b/OpenAuth.App/ServiceApp/DataAnalysisApp.cs
@@ -213,7 +213,7 @@ namespace OpenAuth.App.ServiceApp
                             UserName = b.Name,
                             TaskCount = SqlFunc.AggregateCount(a.Id),
                             TuBanCount = SqlFunc.AggregateSum(a.EndNum - a.BeginNum),
-                        }).ToListAsync();
+                        }).MergeTable().OrderByDescending((t)=>t.TuBanCount).ToListAsync();
 
                     return new Response<List<UserOrGroupTaskResp>>
                     {
@@ -234,7 +234,7 @@ namespace OpenAuth.App.ServiceApp
                             UserName = c.Name,
                             TaskCount = SqlFunc.AggregateCount(a.Id),
                             TuBanCount = SqlFunc.AggregateSum(a.EndNum - a.BeginNum),
-                        }).ToListAsync();
+                        }).MergeTable().OrderByDescending((t) => t.TuBanCount).ToListAsync();
 
                     return new Response<List<UserOrGroupTaskResp>>
                     {