From 87c74588a471cca2d6b18cdf1abb6d33bf698c69 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 13 Aug 2024 10:32:27 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E9=A4=90=E6=AC=A1=E5=B0=B1=E9=A4=90?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Order/Controllers/BalanceSummaryController.cs | 7 +++++++ Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs | 2 +- .../Order/Services/Implements/BalanceSummaryService.cs | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs index 154eafb0..c508aaa9 100644 --- a/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs +++ b/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs @@ -60,5 +60,12 @@ public class BalanceSummaryController : ControllerBase public async Task BalanceRecordShiftAnalysisAmountAndCountAsync([FromQuery] BalanceRecordAnalysisByShiftRequest request) { return await _balanceSummaryService.BalanceRecordShiftAnalysisAmountAndCountAsync(request); +} + /// 用餐分析(餐次) + /// + [HttpGet("analysis/shift")] + public async Task BalanceRecordAnalysisByShiftAsync([FromQuery] BalanceRecordAnalysisByShiftRequest request) + { + return await _balanceSummaryService.BalanceRecordAnalysisByShiftAsync(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 b6a192d9..0fac698c 100644 --- a/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs +++ b/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs @@ -10,8 +10,8 @@ public interface IBalanceSummaryService : IScopeDependency Task> BalanceRecordAnalysisByCostIdAsync(); - 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 5a76b686..cad9e16d 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs @@ -99,6 +99,7 @@ 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 })