|
@@ -5610,7 +5610,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
{
|
|
{
|
|
var itemsHandled = _workflowTraceRepository.Queryable()
|
|
var itemsHandled = _workflowTraceRepository.Queryable()
|
|
.LeftJoin<Workflow>((x, w) => x.WorkflowId == w.Id)
|
|
.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.StartTime.Value)
|
|
.Where((x, w) => x.HandleTime <= dto.EndTime.Value)
|
|
.Where((x, w) => x.HandleTime <= dto.EndTime.Value)
|
|
.WhereIF(!string.IsNullOrEmpty(dto.UserName), (x, w) => x.HandlerName == dto.UserName)
|
|
.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.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)
|
|
|
|
|
|
+ .WhereIF(dto.TitleCode.ToUpper() == "SENDORDERNUM", (x, su) => x.Status == EWorkflowStepStatus.Handled && !SqlFunc.JsonListObjectAny(x.NextHandlers, "OrgId", OrgSeedData.CenterId))
|
|
.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()
|