From e641ce92a7b78573dbaa1a185c020ef94e3c0566 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 12 Jun 2024 10:01:23 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E9=A4=90=E8=A1=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/MealSupplementRecordService.cs | 42 ++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) 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