HC_YFZX
/
Infrastructure
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Insight' of http://123.132.248.154:10000/HC_YFZX/Infrastructure into Insight

Insight
continue 2024-11-19 14:12:25 +08:00
parent 94a091c62a 288ed6e385
commit cacf4ff730
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenAuth.App/ServiceApp/DataAnalysisApp.cs
View File

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

10
OpenAuth.App/ServiceApp/Response/AiShpDataExpenseAccountingTableResp.cs
View File

@ -35,23 +35,23 @@ namespace OpenAuth.App.ServiceApp.Response
/// <summary> /// <summary>
/// 影像生产 /// 影像生产
/// </summary> /// </summary>
public string ShpProduction { get; set; } public int ShpProduction { get; set; }
/// <summary> /// <summary>
/// 解译 /// 解译
/// </summary> /// </summary>
public string ShpInterpretation { get; set; } public int ShpInterpretation { get; set; }
/// <summary> /// <summary>
/// 研判分析 /// 研判分析
/// </summary> /// </summary>
public string Judgment { get; set; } public int Judgment { get; set; }
/// <summary> /// <summary>
/// 图斑推送 /// 图斑推送
/// </summary> /// </summary>
public string Push { get; set; } public int Push { get; set; }
/// <summary> /// <summary>
/// 费用 /// 费用
/// </summary> /// </summary>
public string Cost { get; set; } public double Cost { get; set; }
/// <summary> /// <summary>
/// 格式 /// 格式
/// </summary> /// </summary>

3
OpenAuth.WebApi/Controllers/ServiceControllers/DataAnalysisController.cs
View File

@ -22,7 +22,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <summary> /// <summary>
/// 小组或人员统计 /// 小组或人员统计
/// </summary> /// </summary>
/// <param name="type">1-小组，2-人员</param> /// <param name="type">2-小组，1-人员</param>
/// <param name="dateType">1-本月，2-本周，3-本日</param> /// <param name="dateType">1-本月，2-本周，3-本日</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
@ -47,7 +47,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <param name="endTime"></param> /// <param name="endTime"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[AllowAnonymous]
public async Task<Response<AiShpDataExpenseAccountingTableResp>> GetAiShpDataExpenseAccountingTable(DateTime beginTime, DateTime endTime) public async Task<Response<AiShpDataExpenseAccountingTableResp>> GetAiShpDataExpenseAccountingTable(DateTime beginTime, DateTime endTime)
{ {
Response<AiShpDataExpenseAccountingTableResp> response = new Response<AiShpDataExpenseAccountingTableResp>(); Response<AiShpDataExpenseAccountingTableResp> response = new Response<AiShpDataExpenseAccountingTableResp>();