diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 3f0957d4..5b704377 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -337,7 +337,7 @@ public class BalanceService : IBalanceService .LeftJoin((record, ga, department) => ga.DepartmentNo == department.No) .LeftJoin((record, ga, department, bPlace) => record.BusinessPlaceCode == bPlace.Code) .Where((record, ga) => record.UserCode == userCode && factories.Contains(record.TenantId)) - .Where(record => record.Status == BalanceRecordStatusEnumType.Valid && record.Type == BalanceRecordTypeEnumType.Out) + .Where(record => record.Status == BalanceRecordStatusEnumType.Valid || record.Status == BalanceRecordStatusEnumType.Obsolute) .Where(record => record.Source != BalanceRecordSourceEnumType.EMealVoucher) //不展示电子餐券信息 .WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End) .WhereIF(request.ApplicationType.HasValue, record => record.ApplicationType == request.ApplicationType) @@ -345,7 +345,7 @@ public class BalanceService : IBalanceService .Select((record, ga, department, bPlace) => new BalanceRecordUserPageResponse { Id = record.Id, - CurrentAmount = SqlFunc.Abs(record.Amount), + CurrentAmount = record.Amount, Source = record.Source, No = record.No, BusinessPlaceName = bPlace.Name, @@ -362,7 +362,7 @@ public class BalanceService : IBalanceService var monthSum = await _dbContext.Queryable() .Where(x => x.UserCode == userCode && factories.Contains(x.TenantId)) .Where(x => x.CostDate >= monthStart && x.CostDate <= monthEnd) - .Where(x => x.Status == BalanceRecordStatusEnumType.Valid && x.Type == BalanceRecordTypeEnumType.Out) + .Where(x => x.Status == BalanceRecordStatusEnumType.Valid) .Where(x => x.Source != BalanceRecordSourceEnumType.EMealVoucher) .SumAsync(x => SqlFunc.Abs(x.Amount));