yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 餐补数据来源修改

Browse Source
This commit is contained in:
liguoyang
2024-06-12 10:01:23 +08:00
parent 00fd009ce0
commit e641ce92a7
1 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs
View File

@@ -81,27 +81,49 @@ public class MealSupplementRecordService : IMealSupplementRecordService
{ {
var code = _currentUser.GetUserClaim("jinko-code") ?? string.Empty; var code = _currentUser.GetUserClaim("jinko-code") ?? string.Empty;
var data = await _dbContext.Queryable<MealSupplementRecordEntity>() var data = await _dbContext.Queryable<BalanceRecordEntity>()
.Where(x => x.Date >= request.SearchDateTimePeriod.Start && x.Date <= request.SearchDateTimePeriod.End) .Where(x => x.CostDateTime >= request.SearchDateTimePeriod.Start && x.CostDateTime <= request.SearchDateTimePeriod.End)
.Where(x => x.Status == MealSupplementStatusEnumtype.Success) .Where(x => x.Status == BalanceRecordStatusEnumType.Valid)
.Where(x => x.Code == code) .Where(x => x.ApplicationType == CanteenApplicationTypeEnumType.MealSupplement)
.OrderBy(x => x.Date, OrderByType.Desc) .Where(x => x.UserCode == code)
.OrderBy(x => x.CostDateTime, OrderByType.Desc)
.Select(x => new MealSupplementRecordItemResponse .Select(x => new MealSupplementRecordItemResponse
{ {
CurrentAmount = x.Amount, CurrentAmount = x.Amount,
Date = x.Date, Date = x.CostDate,
Remark = x.Remark Remark = x.Remark
}) })
.ToListAsync(); .ToListAsync();
// var data = await _dbContext.Queryable<MealSupplementRecordEntity>()
// .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 now = DateTime.Now;
var monthStart = new DateTime(now.Year, now.Month, 1); var monthStart = new DateTime(now.Year, now.Month, 1);
var monthEnd = monthStart.AddMonths(1).AddSeconds(-1); var monthEnd = monthStart.AddMonths(1).AddSeconds(-1);
var monthSum = await _dbContext.Queryable<MealSupplementRecordEntity>() // var monthSum = await _dbContext.Queryable<MealSupplementRecordEntity>()
.Where(x => x.Date >= monthStart && x.Date <= monthEnd) // .Where(x => x.Date >= monthStart && x.Date <= monthEnd)
.Where(x => x.Status == MealSupplementStatusEnumtype.Success) // .Where(x => x.Status == MealSupplementStatusEnumtype.Success)
.Where(x => x.Code == code) // .Where(x => x.Code == code)
// .SumAsync(x => SqlFunc.Abs(x.Amount));
var monthSum = await _dbContext.Queryable<BalanceRecordEntity>()
.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)); .SumAsync(x => SqlFunc.Abs(x.Amount));
return new MealSupplementRecordMyResponse return new MealSupplementRecordMyResponse