|
|
@@ -856,6 +856,8 @@ public class OrderController : BaseController
|
|
|
public async Task<PagedDto<OrderScreenListDto>> ScreenList([FromQuery] ScreenListDto dto)
|
|
|
{
|
|
|
var (total, items) = await _orderScreenRepository.Queryable()
|
|
|
+ .Includes(x=>x.Order)
|
|
|
+ .Includes(x=>x.VisitDetail)
|
|
|
.Includes(x => x.Visit, d => d.Order)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Visit.Order.Title.Contains(dto.Keyword!) || d.Visit.Order.No.Contains(dto.Keyword!))
|
|
|
.WhereIF(dto.Status == EScreenStatus.Apply || dto.Status == EScreenStatus.Approval || dto.Status == EScreenStatus.End, x => x.Status == dto.Status)
|
