From ee8784195f44b65da749b0b222ac2355f201ce0a Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 13 Nov 2024 15:41:15 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=94=A8=E6=88=B7=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=8A=B6=E6=80=81=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Order/Response/BalanceRecordUserPageResponse.cs | 5 +++++ .../Order/Services/Implements/BalanceService.cs | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordUserPageResponse.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordUserPageResponse.cs index f056026b..7c80e5c2 100644 --- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordUserPageResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordUserPageResponse.cs @@ -21,6 +21,11 @@ public class BalanceRecordUserPageResponse public string SourceDesc => Source.GetDescription(); + /// + /// 状态 + /// + public BalanceRecordStatusEnumType Status { get; set; } + /// /// 金额 /// diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 80b219d5..64bfb9e4 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -358,7 +358,8 @@ public class BalanceService : IBalanceService Id = record.Id, CurrentAmount = SqlFunc.Abs(record.Amount), Source = record.Source, - No = SqlFunc.IIF(record.Status == BalanceRecordStatusEnumType.Obsolute && record.Remark == "退款", "(已退)" + record.No, record.No), + Status = record.Status, + No = SqlFunc.IIF(record.Status == BalanceRecordStatusEnumType.Obsolute, "(已退)" + record.No, record.No), BusinessPlaceName = bPlace.Name, ShiftType = record.ShiftType, CostDateTime = record.CostDateTime, @@ -372,7 +373,7 @@ public class BalanceService : IBalanceService var monthSum = await _dbContext.Queryable() .Where(x => x.CostDateTime >= monthStart && x.CostDateTime <= monthEnd) - .Where(x => x.Type == BalanceRecordTypeEnumType.Out && (x.Status == BalanceRecordStatusEnumType.Valid || x.Status == BalanceRecordStatusEnumType.Obsolute)) + .Where(x => x.Type == BalanceRecordTypeEnumType.Out && x.Status == BalanceRecordStatusEnumType.Valid) .Where(x => x.Source != BalanceRecordSourceEnumType.EMealVoucher) .Where(x => x.UserCode == jinkoCode) .SumAsync(x => SqlFunc.Abs(x.Amount));