瀏覽代碼

更新查询条件,新增对 JSON 列表的过滤逻辑

在 `SendOrderReportAsync_LZ` 和 `query2` 查询中,新增了对 `x.NextHandlers` JSON 列表对象的过滤条件,确保 `OrgId` 不等于 `OrgSeedData.CenterId`。具体修改包括:
- 更新 `SendOrderReportAsync_LZ` 方法中的查询条件,添加 `!SqlFunc.JsonListObjectAny(x.NextHandlers, "OrgId", OrgSeedData.CenterId)`。
- 更新 `query2` 查询逻辑,针对 `dto.TitleCode.ToUpper() == "SENDORDERNUM"` 的情况,添加相同的 JSON 列表过滤条件。
田爽 4 天之前
父節點
當前提交
dca6981a24
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      src/Hotline.Application/OrderApp/OrderApplication.cs

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

@@ -5610,7 +5610,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
     {
 		var itemsHandled = _workflowTraceRepository.Queryable()
 			   .LeftJoin<Workflow>((x, w) => x.WorkflowId == w.Id)
-			   .Where((x, w) => w.ModuleCode == WorkflowModuleConsts.OrderHandle && x.Status == EWorkflowStepStatus.Handled && (x.Name =="派单组" || x.Name == "班长审批"))
+			   .Where((x, w) => w.ModuleCode == WorkflowModuleConsts.OrderHandle && x.Status == EWorkflowStepStatus.Handled && !SqlFunc.JsonListObjectAny(x.NextHandlers, "OrgId", OrgSeedData.CenterId) && (x.Name =="派单组" || x.Name == "班长审批"))
 			   .Where((x, w) => x.HandleTime >= dto.StartTime.Value)
 			   .Where((x, w) => x.HandleTime <= dto.EndTime.Value)
 			   .WhereIF(!string.IsNullOrEmpty(dto.UserName), (x, w) => x.HandlerName == dto.UserName)
@@ -5725,7 +5725,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)
+                .WhereIF(dto.TitleCode.ToUpper() == "SENDORDERNUM", (x, su) => x.Status == EWorkflowStepStatus.Handled && !SqlFunc.JsonListObjectAny(x.NextHandlers, "OrgId", OrgSeedData.CenterId))
                 .GroupBy((x, su) => x.ExternalId)
                 .Select((x, su) => new { Id = x.ExternalId })
                 .MergeTable()