部门超期统计明细 工单编号查询

src/Hotline.Application/Orders/OrderApplication.cs

@@ -1245,7 +1245,6 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         var quer = _orderRepository.Queryable()
             .InnerJoin<SystemOrganize>((x, so) => x.ActualHandleOrgCode == so.Id && so.Level == 1)
             .Where((x, so) => x.CreationTime >= dto.StartTime && x.CreationTime <= dto.EndTime)
-            .WhereIF(!string.IsNullOrEmpty(dto.No), (x, so) => x.No == dto.No)
 			//.WhereIF(dto.Statuses.Any(), x => dto.Statuses.Contains(x.Status))  //工单状态
 			.WhereIF(dto.QueryType == 1, (x, so) => x.Status >= EOrderStatus.Filed && x.ExpiredTime < x.FiledTime) //业务已办超期
             .WhereIF(dto.QueryType == 3, (x, so) => x.Status < EOrderStatus.Filed && x.ExpiredTime < SqlFunc.GetDate()) //业务待办超期
@@ -1272,7 +1271,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 .Select(x => new { Id = x.ExternalId, WorkflowId = x.ExternalId, HandlerOrgName = x.HandlerOrgName });
 
             quer = _orderRepository.Queryable().InnerJoin(queryCountersign, (o, w) => o.Id == w.Id)
-                .Select((o, w) => new Order { DaysOverdueOrgName = w.HandlerOrgName, Id = o.Id.SelectAll() });
+                .Select((o, w) => new Order { DaysOverdueOrgName = w.HandlerOrgName, Id = o.Id.SelectAll() })
+				.WhereIF(!string.IsNullOrEmpty(dto.No), o => o.No == dto.No);
             //quer = _orderRepository.UnionAll(quer, queryCountersignOrder);
         }
 
@@ -1291,7 +1291,6 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         var quer = _orderRepository.Queryable()
             .InnerJoin<SystemOrganize>((x, so) => x.ActualHandleOrgCode == so.Id && so.Level == 1)
             .Where((x, so) => x.CreationTime >= dto.StartTime && x.CreationTime <= dto.EndTime)
-            .WhereIF(!string.IsNullOrEmpty(dto.No), (x, so) => x.No == dto.No)
 			.WhereIF(dto.Statuses.Any(), (x, so) => dto.Statuses.Contains(x.Status)) //工单状态
             .WhereIF(dto.ExpiredType is 2, (x, so) => x.OrderDelays.Any(x => x.DelayState == EDelayState.Pass))
             .Where((x, so) =>
@@ -1317,7 +1316,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         var queryCountersignOrder = _orderRepository.Queryable().InnerJoin(queryCountersign, (o, w) => o.Id == w.Id)
             .Select((o, w) => new Order { DaysOverdueOrgName = w.HandlerOrgName, Id = o.Id.SelectAll() });
         quer = _orderRepository.UnionAll(quer, queryCountersignOrder).MergeTable()
-            .InnerJoin<SystemOrganize>((x, so) => x.ActualHandleOrgCode == so.Id);
+            .InnerJoin<SystemOrganize>((x, so) => x.ActualHandleOrgCode == so.Id)
+			.WhereIF(!string.IsNullOrEmpty(dto.No), (x, so) => x.No == dto.No);
         return quer;
     }