|
@@ -784,6 +784,7 @@ public class OrderController : BaseController
|
|
|
var (total, items) = await _orderVisitApplyRepository.Queryable()
|
|
|
.Includes(d => d.Order)
|
|
|
.Includes(d=>d.OrderVisit,d=>d.OrderVisitDetails)
|
|
|
+ .Includes(d=>d.OrderVisit,d=>d.Employee)
|
|
|
.Includes(d => d.Employee)
|
|
|
.WhereIF(dto.VisitApplyState != null, x => x.VisitApplyState == dto.VisitApplyState)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.OrderNo.Contains(dto.Keyword))
|