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));