Ver Fonte

调整查询逻辑:简化与强化条件

在 `OrderApplication.cs` 文件中:
1. 第一个查询逻辑移除了对 `x.NextHandlers` 的检查,仅保留 `x.Status` 为 `Handled` 的条件。
2. 第二个查询逻辑增加了对 `x.NextHandlers` 的检查,要求其不包含指定的 `"OrgId"`。
田爽 há 4 dias atrás
pai
commit
3478411d3c
1 ficheiros alterados com 2 adições e 2 exclusões
  1. 2 2
      src/Hotline.Application/OrderApp/OrderApplication.cs

+ 2 - 2
src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -5726,7 +5726,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 .Where((x, su) => x.ModuleCode == WorkflowModuleConsts.OrderHandle && x.BusinessType == EBusinessType.Send)
                 .Where((x, su) => x.CreationTime >= dto.StartTime.Value && x.CreationTime <= dto.EndTime.Value && su.UserId == dto.UserId)
                 .WhereIF(dto.TitleCode.ToUpper() == "NOSENDORDERNUM", (x, su) => x.Status != EWorkflowStepStatus.Handled)
-                .WhereIF(dto.TitleCode.ToUpper() == "SENDORDERNUM", (x, su) => x.Status == EWorkflowStepStatus.Handled && !SqlFunc.JsonListObjectAny(x.NextHandlers, "OrgId", OrgSeedData.CenterId))
+                .WhereIF(dto.TitleCode.ToUpper() == "SENDORDERNUM", (x, su) => x.Status == EWorkflowStepStatus.Handled )
                 .GroupBy((x, su) => x.ExternalId)
                 .Select((x, su) => new { Id = x.ExternalId })
                 .MergeTable()
@@ -5765,7 +5765,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 .Where(x => x.ModuleCode == WorkflowModuleConsts.OrderHandle && (x.Name == "派单组" || x.Name == "班长审批"))
                 .Where(x => x.CreationTime >= dto.StartTime.Value && x.CreationTime <= dto.EndTime.Value && x.HandlerId == dto.UserId)
                 .WhereIF(dto.TitleCode.ToUpper() == "NOSENDORDERNUM", x => x.Status != EWorkflowStepStatus.Handled)
-                .WhereIF(dto.TitleCode.ToUpper() == "SENDORDERNUM", x => x.Status == EWorkflowStepStatus.Handled)
+                .WhereIF(dto.TitleCode.ToUpper() == "SENDORDERNUM", x => x.Status == EWorkflowStepStatus.Handled && !SqlFunc.JsonListObjectAny(x.NextHandlers, "OrgId", OrgSeedData.CenterId))
                 .WhereIF(dto.RoleName is "派单员", x => x.Name == "派单组")
                 .WhereIF(dto.RoleName is "中心班长", x => x.Name == "班长审批")
                 .GroupBy(x => x.ExternalId)