|
@@ -5726,7 +5726,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
.Where((x, su) => x.ModuleCode == WorkflowModuleConsts.OrderHandle && x.BusinessType == EBusinessType.Send)
|
|
.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)
|
|
.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() == "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)
|
|
.GroupBy((x, su) => x.ExternalId)
|
|
|
.Select((x, su) => new { Id = x.ExternalId })
|
|
.Select((x, su) => new { Id = x.ExternalId })
|
|
|
.MergeTable()
|
|
.MergeTable()
|
|
@@ -5765,7 +5765,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
.Where(x => x.ModuleCode == WorkflowModuleConsts.OrderHandle && (x.Name == "派单组" || x.Name == "班长审批"))
|
|
.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)
|
|
.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() == "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 == "派单组")
|
|
|
.WhereIF(dto.RoleName is "中心班长", x => x.Name == "班长审批")
|
|
.WhereIF(dto.RoleName is "中心班长", x => x.Name == "班长审批")
|
|
|
.GroupBy(x => x.ExternalId)
|
|
.GroupBy(x => x.ExternalId)
|
