|
@@ -3242,7 +3242,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
{
|
|
|
//任务217 待回访工单显示优化(自贡+泸州通用)回访状态选择“待回访”,在该状态下不查“设为未接通”工单
|
|
|
query = query.WhereIF(dto.VisitStateQuery == EVisitStateQuery.NoVisit,
|
|
|
- d => (d.VisitState == EVisitState.WaitForVisit || d.VisitState == EVisitState.NoSatisfiedWaitForVisit) && d.IsPutThrough != false);
|
|
|
+ d => (d.VisitState == EVisitState.WaitForVisit || d.VisitState == EVisitState.NoSatisfiedWaitForVisit) && (d.IsPutThrough == true || d.IsPutThrough == null));
|
|
|
}
|
|
|
else
|
|
|
query = query.WhereIF(dto.VisitStateQuery == EVisitStateQuery.NoVisit, d => d.VisitState == EVisitState.WaitForVisit || d.VisitState == EVisitState.NoSatisfiedWaitForVisit);
|
|
@@ -4134,6 +4134,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
public ISugarQueryable<OrderTsDetailsDto> QueryOrderTsDetailsList(PagedKeywordRequest dto)
|
|
|
{
|
|
|
var query = _orderTsDetailsRepository.Queryable()
|
|
|
+ .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
|
|
|
.GroupBy(p => p.Terms)
|
|
|
.Select(p => new OrderTsDetailsDto
|
|
|
{
|