|
@@ -1294,10 +1294,10 @@ public class OrderController : BaseController
|
|
|
.Includes(x => x.Order)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
|
|
|
d => d.Order.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
|
|
|
- //.WhereIF(dto.IsApply == true, x => x.DelayState != EDelayState.Examining)
|
|
|
- //.WhereIF(dto.IsApply == false, x => x.DelayState == EDelayState.Examining)
|
|
|
- .WhereIF(dto.DelayState != null, x => x.DelayState == dto.DelayState)
|
|
|
- .Where(x=>x.DelayState == EDelayState.Examining)
|
|
|
+ .WhereIF(dto.IsApply == true, x => x.DelayState != EDelayState.Examining)
|
|
|
+ .WhereIF(dto.IsApply == false, x => x.DelayState == EDelayState.Examining)
|
|
|
+ //.WhereIF(dto.DelayState != null, x => x.DelayState == dto.DelayState)
|
|
|
+ //.Where(x=>x.DelayState == EDelayState.Examining)
|
|
|
.OrderByDescending(x => x.ApplyDelayTime)
|
|
|
.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
|
|