From 4102422792f51a0711fa429d0d087a37beace938 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Mon, 15 Jan 2024 10:49:45 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=B1=87=E6=80=BB=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Response/BalanceRecordResponse.cs        |  5 +++++
 .../Order/Services/Implements/BalanceService.cs    | 14 ++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs
index 07734136..d8ffb6ad 100644
--- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs
@@ -114,4 +114,9 @@ public class BalanceRecordResponse
     /// 记录产生时间
     /// </summary>
     public DateTime CostDateTime { get; set; }
+
+    /// <summary>
+    /// 汇总金额
+    /// </summary>
+    public decimal Sum { get; set; }
 }
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index ab97c515..7348a454 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -94,7 +94,7 @@ public class BalanceService : IBalanceService
             };
         }
 
-        var query = _dbContext.Queryable<BalanceRecordEntity>()
+        var page = await _dbContext.Queryable<BalanceRecordEntity>()
               .LeftJoin<GainfoEntity>((record, ga) => record.UserNo == ga.No)
               .LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
               .LeftJoin<CanteenBusinessPlaceEntity>((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code)
@@ -128,12 +128,14 @@ public class BalanceService : IBalanceService
                   DepartmentName = department.Name,
                   BusinessPlaceName = bplace.Name,
                   BusinessShiftName = bshift.Name,
-                  CostDateTime = record.CreateTime // todo
-              });
+                  CostDateTime = record.CostDateTime
+              }).ToPageListAsync(request);
 
-        //.ToPageListAsync(request);
-        await Console.Out.WriteLineAsync(query.ToSqlValue());
-        return await query.ToPageListAsync(request);
+
+        var sum = page.Data.Sum(x => Math.Abs(x.Amount));
+        page.Data.ForEach(x => x.Sum = sum);
+
+        return page;
     }
 
     public async Task<Pagination<BalanceRecordUserResponse>> GetPageByUserAsync(BalanceRecordUserPageRequest request)