fix 就餐人员列表查询根据消费记录显示

This commit is contained in:
2024-11-13 16:11:23 +08:00
parent e2bb6d5d0e
commit 3a47580441
2 changed files with 9 additions and 6 deletions

View File

@@ -28,12 +28,12 @@ public class GainfoMealService : IGainfoMealService
public async Task<Pagination<GainfoMealResponse>> GetPageAsync(GainfoMealPageRequest request)
{
var factory = _currentUser.GetStringTenantId();
var factories = await GetWalletFactoriesAsync(_currentUser.GetStringTenantId());
var factories = await GetWalletFactoriesAsync(factory);
return await _dbContext.Queryable<GainfoEntity>().AS(request.IsLeave ? "GainfoLeave" : "Gainfo")
.LeftJoin<DepartmentEntity>((x, dept) => dept.No == x.DepartmentNo)
.WhereIF(request.Search.IsPresent(), x => x.Code == request.Search || x.Name == request.Search)
.Where(x => x.Factory == factory)
.Where(x => SqlFunc.Subqueryable<BalanceRecordEntity>().Where(p => p.UserCode == x.Code && p.TenantId == factory).Any())
.WhereIF(request.IsLeave && request.SearchDateTimePeriod.HasValue(), x => x.ResignationDate >= request.SearchDateTimePeriod.Start &&
x.ResignationDate <= request.SearchDateTimePeriod.End)
.Select((x, dept) => new GainfoMealResponse