1 中心办理 2 转单件 3 二次派发件 工单待办处理

src/Hotline.Application/Orders/OrderApplication.cs

@@ -3907,6 +3907,15 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 
         }
 
+        if (dto.QueryType is 1 || dto.QueryType is 2)
+        {
+            query.WhereIF(dto.QueryType is 1, d => d.IsForwarded == false)
+                .WhereIF(dto.QueryType is 2, d => d.IsForwarded == true)
+                .Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId == d.Id && os.IsDeleted == false && os.SpecialType == ESpecialType.ReTransact)
+                    .NotAny())
+                ;
+        }
+
         query.Where(d => d.Status != EOrderStatus.WaitForAccept &&
                          d.Status != EOrderStatus.BackToUnAccept &&
                          d.Status != EOrderStatus.SpecialToUnAccept &&
@@ -3916,11 +3925,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .Where(d => SqlFunc.Subqueryable<OrderDelay>().Where(od => od.OrderId == d.Id && od.IsDeleted == false && od.DelayState == EDelayState.Examining).NotAny())
             .Where(d => SqlFunc.Subqueryable<OrderSendBackAudit>().Where(osba => osba.OrderId == d.Id && osba.IsDeleted == false && osba.State == ESendBackAuditState.Apply)
                 .NotAny())
-            .Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(s => s.OrderId == d.Id && s.State == 0 && s.IsDeleted == false)
-                .WhereIF(dto.QueryType != null && (dto.QueryType == 1 || dto.QueryType == 2), s => s.SpecialType == ESpecialType.ReTransact)
-                //.WhereIF(dto.QueryType != null && dto.QueryType == 3, s =>  s.SpecialType != ESpecialType.ReTransact)
-                .NotAny())
-            .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
+			.Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(s => s.OrderId == d.Id && s.State == 0 && s.IsDeleted == false).NotAny())
+			.WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.StartsWith(dto.Keyword))
             .WhereIF(!string.IsNullOrEmpty(dto.No), d => d.No == dto.No)
             .WhereIF(!string.IsNullOrEmpty(dto.AreaCode), d => d.AreaCode == dto.AreaCode)