fix 增加厂区查询
This commit is contained in:
@@ -16,4 +16,9 @@ public class VoucherBalancePageRequest : PageDto
|
|||||||
public string UserCode { get; set; }
|
public string UserCode { get; set; }
|
||||||
|
|
||||||
public DateTimePeriod SearchDateTimePeriod { get; set; }
|
public DateTimePeriod SearchDateTimePeriod { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 筛选厂区
|
||||||
|
/// </summary>
|
||||||
|
public List<string> Factories { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -221,6 +221,7 @@ public class BirthdayVoucherService : BaseVoucherService, IVoucherService
|
|||||||
return await DbContext.Queryable<BalanceRecordEntity>()
|
return await DbContext.Queryable<BalanceRecordEntity>()
|
||||||
.LeftJoin<BusinessPlaceEntity>((x, bPlace) => x.BusinessPlaceCode == bPlace.Code)
|
.LeftJoin<BusinessPlaceEntity>((x, bPlace) => x.BusinessPlaceCode == bPlace.Code)
|
||||||
.LeftJoin<DepartmentEntity>((x, bPlace, department) => x.DepartmentNo == department.No)
|
.LeftJoin<DepartmentEntity>((x, bPlace, department) => x.DepartmentNo == department.No)
|
||||||
|
.WhereIF(request.Factories.IsPresent(), x => request.Factories.Contains(x.TenantId))
|
||||||
.WhereIF(request.UserCode.IsPresent(), x => x.UserCode == request.UserCode)
|
.WhereIF(request.UserCode.IsPresent(), x => x.UserCode == request.UserCode)
|
||||||
.WhereIF(request.SearchDateTimePeriod.HasValue(), x => x.CostDate >= request.SearchDateTimePeriod.Start && x.CostDate <= request.SearchDateTimePeriod.End) //成本日期
|
.WhereIF(request.SearchDateTimePeriod.HasValue(), x => x.CostDate >= request.SearchDateTimePeriod.Start && x.CostDate <= request.SearchDateTimePeriod.End) //成本日期
|
||||||
.Where(x => x.Status == BalanceRecordStatusEnumType.Valid && x.Type == BalanceRecordTypeEnumType.Out) //有效,消费数据
|
.Where(x => x.Status == BalanceRecordStatusEnumType.Valid && x.Type == BalanceRecordTypeEnumType.Out) //有效,消费数据
|
||||||
|
|||||||
Reference in New Issue
Block a user