From 99e2e3cc103de45c936244e5a890a6ecb2c528a9 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Mon, 8 Apr 2024 19:12:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BD=9C=E5=BA=9F=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Controllers/BalancesController.cs   |  1 +
 .../Response/BalanceRecordAnalysisRespones.cs | 55 +++++++++----------
 .../Services/Implements/BalanceService.cs     |  6 +-
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
index abb8d969..8e13109e 100644
--- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
+++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
@@ -90,6 +90,7 @@ public class BalancesController : ControllerBase
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
+    [Authorize(Roles = "admin,tenant-admin")]
     [HttpPost("obsoluteOutRecord")]
     [Transactional]
     public async Task ObsoluteAsync(BalanceRecordObsoluteRequest request)
diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisRespones.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisRespones.cs
index e9e6ccb6..f938e46e 100644
--- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisRespones.cs
+++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisRespones.cs
@@ -1,35 +1,34 @@
-namespace Dlhis.Canteen.Order.Response
+namespace Dlhis.Canteen.Order.Response;
+
+public class BalanceRecordAnalysisRespones
 {
-    public class BalanceRecordAnalysisRespones
-    {
-        /// <summary>
-        /// 消费日期
-        /// </summary>
-        public DateOnly CostDate { get; set; }
+    /// <summary>
+    /// 消费日期
+    /// </summary>
+    public DateOnly CostDate { get; set; }
 
-        /// <summary>
-        /// 早餐人数
-        /// </summary>
-        public int BreakfastNumberOfPeople { get; set; }
+    /// <summary>
+    /// 早餐人数
+    /// </summary>
+    public int BreakfastNumberOfPeople { get; set; }
 
-        /// <summary>
-        /// 午餐人数
-        /// </summary>
-        public int LunchNumberOfPeople { get; set; }
+    /// <summary>
+    /// 午餐人数
+    /// </summary>
+    public int LunchNumberOfPeople { get; set; }
 
-        /// <summary>
-        /// 晚餐人数
-        /// </summary>
-        public int DinnerNumberOfPeople { get; set; }
+    /// <summary>
+    /// 晚餐人数
+    /// </summary>
+    public int DinnerNumberOfPeople { get; set; }
 
-        /// <summary>
-        /// 宵夜人数
-        /// </summary>
-        public int LateNightNumberOfPeople { get; set; }
+    /// <summary>
+    /// 宵夜人数
+    /// </summary>
+    public int LateNightNumberOfPeople { get; set; }
 
-        /// <summary>
-        /// 总人数
-        /// </summary>
-        public int TotalNumberOfPeople { get; set; }
-    }
+    /// <summary>
+    /// 总人数
+    /// </summary>
+    public int TotalNumberOfPeople { get; set; }
 }
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index f07ad2b4..6134e9bd 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -82,6 +82,7 @@ public class BalanceService : IBalanceService
                     TenantId = record.TenantId,
                 })
                 .ToPageListAsync(request);
+
         page.Data.ForEach(item =>
         {
             item.Amount = Math.Abs(item.Amount);
@@ -414,7 +415,7 @@ public class BalanceService : IBalanceService
                 //每个餐次人数
                 BreakfastNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Select(x => x.UserNo).Distinct().Count(),
                 LunchNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Lunch).Select(x => x.UserNo).Distinct().Count(),
-                DinnerNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Lunch).Select(x => x.UserNo).Distinct().Count(),
+                DinnerNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Dinner).Select(x => x.UserNo).Distinct().Count(),
                 LateNightNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Select(x => x.UserNo).Distinct().Count(),
 
                 TotalNumberOfPeople = first.Where(x => x.CostDate.ToString("yyyy-MM-dd") == first.Key).Select(x => x.UserNo).Distinct().Count()
@@ -532,7 +533,7 @@ public class BalanceService : IBalanceService
              .Select((record, ga, department, bplace) => new BalanceRecordUserPageResponse
              {
                  Id = record.Id,
-                 CurrentAmount = record.Amount,
+                 CurrentAmount = SqlFunc.Abs(record.Amount),
                  Source = record.Source,
                  No = record.No,
                  BusinessPlaceName = bplace.Name,
@@ -549,6 +550,7 @@ public class BalanceService : IBalanceService
         var monthSum = await _dbContext.Queryable<BalanceRecordEntity>()
             .Where(x => x.CostDateTime >= monthStart && x.CostDateTime <= monthEnd)
             .Where(x => x.Type == BalanceRecordTypeEnumType.Out)
+            .Where(x => x.Status == BalanceRecordStatusEnumType.Valid)
             .Where(x => x.UserCode == jinkoCode)
             .SumAsync(x => SqlFunc.Abs(x.Amount));