fix 查询优化
This commit is contained in:
@@ -27,6 +27,7 @@ public class MealSupplementsRecordController
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="request"></param>
|
/// <param name="request"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
|
[Authorize(Roles = "admin,tenant-admin")]
|
||||||
[HttpGet("page")]
|
[HttpGet("page")]
|
||||||
public async Task<Pagination<MealSupplementRecordResponse>> MealSupplementRecordPageAsync([FromQuery] MealSupplementRecordRequest request)
|
public async Task<Pagination<MealSupplementRecordResponse>> MealSupplementRecordPageAsync([FromQuery] MealSupplementRecordRequest request)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -18,6 +18,17 @@ public class MealSupplementRecordRequest : PageDto, IValidatableObject
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool? Sync { get; set; }
|
public bool? Sync { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 工作地
|
||||||
|
/// </summary>
|
||||||
|
public string Workplace { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 厂区
|
||||||
|
/// </summary>
|
||||||
|
public string Factory { get; set; }
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 餐补日期范围
|
/// 餐补日期范围
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -33,6 +33,8 @@ public class MealSupplementRecordService : IMealSupplementRecordService
|
|||||||
.LeftJoin<GainfoEntity>((x, ga) => x.Code == ga.Code)
|
.LeftJoin<GainfoEntity>((x, ga) => x.Code == ga.Code)
|
||||||
.WhereIF(request.Status.HasValue, x => x.Status == request.Status)
|
.WhereIF(request.Status.HasValue, x => x.Status == request.Status)
|
||||||
.WhereIF(request.Sync.HasValue, x => x.Sync == request.Sync)
|
.WhereIF(request.Sync.HasValue, x => x.Sync == request.Sync)
|
||||||
|
.WhereIF(request.Workplace.IsPresent(), x => x.Workplace == request.Workplace)
|
||||||
|
.WhereIF(request.Factory.IsPresent(), x => x.Factory == request.Factory)
|
||||||
.WhereIF(request.DateTimePeriod?.Start.HasValue == true
|
.WhereIF(request.DateTimePeriod?.Start.HasValue == true
|
||||||
&& request.DateTimePeriod?.End.HasValue == true,
|
&& request.DateTimePeriod?.End.HasValue == true,
|
||||||
x => x.Date >= request.DateTimePeriod.Start && x.Date <= request.DateTimePeriod.End)
|
x => x.Date >= request.DateTimePeriod.Start && x.Date <= request.DateTimePeriod.End)
|
||||||
|
|||||||
Reference in New Issue
Block a user