From 6cd7f63b9802bb1bde88ee7f85888bf159023508 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 15 Jan 2024 17:56:34 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=9F=A5=E8=AF=A2=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Order/Services/Implements/BalanceService.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 7348a454..b09670d2 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -131,8 +131,14 @@ public class BalanceService : IBalanceService CostDateTime = record.CostDateTime }).ToPageListAsync(request); + //消费总金额 + var sum = await _dbContext.Queryable() + .WhereIF(request.SearchDate.HasValue, record => record.CostDate >= start) + .WhereIF(request.SearchDate.HasValue, record => record.CostDate <= end) + .Where(record => record.TenantId == device.TenantId || (record.DeviceInfo == device.Code.ToString() || record.DeviceInfo == device.UniqueNo)) + .Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid) + .SumAsync(record => SqlFunc.Abs(SqlFunc.IsNull(record.Amount, 0))); - var sum = page.Data.Sum(x => Math.Abs(x.Amount)); page.Data.ForEach(x => x.Sum = sum); return page;