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> { @@ -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> { 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 /// /// 影像生产 /// - public string ShpProduction { get; set; } + public int ShpProduction { get; set; } /// /// 解译 /// - public string ShpInterpretation { get; set; } + public int ShpInterpretation { get; set; } /// /// 研判分析 /// - public string Judgment { get; set; } + public int Judgment { get; set; } /// /// 图斑推送 /// - public string Push { get; set; } + public int Push { get; set; } /// /// 费用 /// - public string Cost { get; set; } + public double Cost { get; set; } /// /// 格式 /// diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/DataAnalysisController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/DataAnalysisController.cs index b32f458..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 /// /// 小组或人员统计 /// - /// 1-小组,2-人员 + /// 2-小组,1-人员 /// 1-本月,2-本周,3-本日 /// [HttpGet] @@ -47,7 +47,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers /// /// [HttpGet] - [AllowAnonymous] public async Task> GetAiShpDataExpenseAccountingTable(DateTime beginTime, DateTime endTime) { Response response = new Response();