From 5e46ad94c9e08bf309f03a6812e5467ced898ef4 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 13 Aug 2024 13:46:06 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E5=B0=B1=E9=A4=90=E5=88=86=E6=9E=90,?= =?UTF-8?q?=E9=A4=90=E6=AC=A1=E4=BD=BF=E7=94=A8=E9=87=91=E9=A2=9D=E5=92=8C?= =?UTF-8?q?=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Order/Controllers/BalanceSummaryController.cs | 12 ++++++++---- .../Order/Services/IBalanceSummaryService.cs | 3 +++ .../Services/Implements/BalanceSummaryService.cs | 1 - 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs index c508aaa9..311a9479 100644 --- a/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs +++ b/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs @@ -61,11 +61,15 @@ public class BalanceSummaryController : ControllerBase { return await _balanceSummaryService.BalanceRecordShiftAnalysisAmountAndCountAsync(request); } - /// 用餐分析(餐次) + + /// + /// 餐次用餐分析,统计金额和人数 /// - [HttpGet("analysis/shift")] - public async Task BalanceRecordAnalysisByShiftAsync([FromQuery] BalanceRecordAnalysisByShiftRequest request) + /// + /// + [HttpGet("shift/analysis/amountAndCount")] + public async Task BalanceRecordShiftAnalysisAmountAndCountAsync([FromQuery] BalanceRecordAnalysisByShiftRequest request) { - return await _balanceSummaryService.BalanceRecordAnalysisByShiftAsync(request); + return await _balanceSummaryService.BalanceRecordShiftAnalysisAmountAndCountAsync(request); } } \ No newline at end of file diff --git a/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs b/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs index 0fac698c..455d7d59 100644 --- a/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs +++ b/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs @@ -14,4 +14,7 @@ public interface IBalanceSummaryService : IScopeDependency Task BalanceRecordShiftAnalysisAmountAndCountAsync(BalanceRecordAnalysisByShiftRequest request); + Task BalanceRecordShiftAnalysisAmountAsync(BalanceRecordAnalysisByShiftRequest request); + + Task BalanceRecordShiftAnalysisAmountAndCountAsync(BalanceRecordAnalysisByShiftRequest request); } \ No newline at end of file diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs index cad9e16d..5a76b686 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs @@ -99,7 +99,6 @@ public class BalanceSummaryService : IBalanceSummaryService var amount = await queryable.SumAsync(x => SqlFunc.Abs(x.Amount)); - var count = typeof(ShiftEnumType).GetFields(BindingFlags.Public | BindingFlags.Static).Length; var result = await queryable.GroupBy(x => new { x.CostDate, x.ShiftType })