diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs index 83f1fdd0..bebd1de0 100644 --- a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs @@ -81,27 +81,49 @@ public class MealSupplementRecordService : IMealSupplementRecordService { var code = _currentUser.GetUserClaim("jinko-code") ?? string.Empty; - var data = await _dbContext.Queryable() - .Where(x => x.Date >= request.SearchDateTimePeriod.Start && x.Date <= request.SearchDateTimePeriod.End) - .Where(x => x.Status == MealSupplementStatusEnumtype.Success) - .Where(x => x.Code == code) - .OrderBy(x => x.Date, OrderByType.Desc) + var data = await _dbContext.Queryable() + .Where(x => x.CostDateTime >= request.SearchDateTimePeriod.Start && x.CostDateTime <= request.SearchDateTimePeriod.End) + .Where(x => x.Status == BalanceRecordStatusEnumType.Valid) + .Where(x => x.ApplicationType == CanteenApplicationTypeEnumType.MealSupplement) + .Where(x => x.UserCode == code) + .OrderBy(x => x.CostDateTime, OrderByType.Desc) .Select(x => new MealSupplementRecordItemResponse { CurrentAmount = x.Amount, - Date = x.Date, + Date = x.CostDate, Remark = x.Remark }) .ToListAsync(); + // var data = await _dbContext.Queryable() + // .Where(x => x.Date >= request.SearchDateTimePeriod.Start && x.Date <= request.SearchDateTimePeriod.End) + // .Where(x => x.Status == MealSupplementStatusEnumtype.Success) + // .Where(x => x.Code == code) + // .OrderBy(x => x.Date, OrderByType.Desc) + // .Select(x => new MealSupplementRecordItemResponse + // { + // CurrentAmount = x.Amount, + // Date = x.Date, + // Remark = x.Remark + // }) + // .ToListAsync(); + var now = DateTime.Now; var monthStart = new DateTime(now.Year, now.Month, 1); var monthEnd = monthStart.AddMonths(1).AddSeconds(-1); - var monthSum = await _dbContext.Queryable() - .Where(x => x.Date >= monthStart && x.Date <= monthEnd) - .Where(x => x.Status == MealSupplementStatusEnumtype.Success) - .Where(x => x.Code == code) + // var monthSum = await _dbContext.Queryable() + // .Where(x => x.Date >= monthStart && x.Date <= monthEnd) + // .Where(x => x.Status == MealSupplementStatusEnumtype.Success) + // .Where(x => x.Code == code) + // .SumAsync(x => SqlFunc.Abs(x.Amount)); + + + var monthSum = await _dbContext.Queryable() + .Where(x => x.CostDateTime >= monthStart && x.CostDateTime <= monthEnd) + .Where(x => x.Status == BalanceRecordStatusEnumType.Valid) + .Where(x => x.ApplicationType == CanteenApplicationTypeEnumType.MealSupplement) + .Where(x => x.UserCode == code) .SumAsync(x => SqlFunc.Abs(x.Amount)); return new MealSupplementRecordMyResponse