|
@@ -632,7 +632,7 @@ public class OrderController : BaseController
|
|
|
public async Task<PagedDto<OrderCanVisitAgainDto>> OrderVisitAgainList([FromQuery] OrderVisitAgainListDto dto)
|
|
|
{
|
|
|
var (total, items) = await _orderVisitedDetailRepository.Queryable()
|
|
|
- .Includes(x => x.OrderVisit, x => x.Order)
|
|
|
+ .Includes(x => x.OrderVisit,x=>x.Order)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.OrderVisit.Order.No.Contains(dto.Keyword))
|
|
|
.Where(x => x.OrderVisit.VisitState == EVisitState.Visited &&
|
|
|
(x.OrderVisit.VisitType == EVisitType.SmsVisit ||
|
|
@@ -783,6 +783,7 @@ public class OrderController : BaseController
|
|
|
{
|
|
|
var (total, items) = await _orderVisitApplyRepository.Queryable()
|
|
|
.Includes(d => d.Order)
|
|
|
+ .Includes(d=>d.OrderVisit)
|
|
|
.Includes(d => d.Employee)
|
|
|
.WhereIF(dto.VisitApplyState != null, x => x.VisitApplyState == dto.VisitApplyState)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.OrderNo.Contains(dto.Keyword))
|