|
@@ -2279,7 +2279,7 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
.LeftJoin<Workflow>((x, w) => x.WorkflowId == w.Id)
|
|
|
//.LeftJoin<WorkflowStepHandler>((x, w, wfsh) => x.StepId == wfsh.WorkflowStepId && wfsh.IsActualHandler == true)
|
|
|
.InnerJoin<SchedulingUser>((x, w, su) => x.HandlerId == su.UserId)
|
|
|
- .Where((x, w, su) => w.ModuleCode == "OrderHandle" && x.BusinessType == EBusinessType.Send && x.Status == EWorkflowStepStatus.Handled)
|
|
|
+ .Where((x, w, su) => w.ModuleCode == "OrderHandle" && x.BusinessType == EBusinessType.Send)
|
|
|
.Where((x, w, su) => x.CreationTime >= dto.StartTime.Value)
|
|
|
.Where((x, w, su) => x.CreationTime <= dto.EndTime.Value)
|
|
|
.GroupBy((x, w, su) => x.WorkflowId)
|
|
@@ -2350,7 +2350,7 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
.LeftJoin<Workflow>((x, w) => x.WorkflowId == w.Id)
|
|
|
//.LeftJoin<WorkflowStepHandler>((x, w, wfsh) => x.StepId == wfsh.WorkflowStepId && wfsh.IsActualHandler == true)
|
|
|
.InnerJoin<SchedulingUser>((x, w, su) => x.HandlerId == su.UserId)
|
|
|
- .Where((x, w, su) => w.ModuleCode == "OrderHandle" && x.BusinessType == EBusinessType.Send && x.Status == EWorkflowStepStatus.Handled)
|
|
|
+ .Where((x, w, su) => w.ModuleCode == "OrderHandle" && x.BusinessType == EBusinessType.Send)
|
|
|
.Where((x, w, su) => x.CreationTime >= dto.StartTime.Value)
|
|
|
.Where((x, w, su) => x.CreationTime <= dto.EndTime.Value)
|
|
|
.GroupBy((x, w, su) => x.WorkflowId)
|