派单量统计

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 == "OrderHandle" && x.BusinessType == EBusinessType.Send && x.Status == EWorkflowStepStatus.Handled && (x.Name =="派单组" || x.Name == "班长审批"))
+			   .Where((x, w) => w.ModuleCode == WorkflowModuleConsts.OrderHandle && x.Status == EWorkflowStepStatus.Handled && (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)
@@ -5626,7 +5626,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 			   });
 		var itemsNo = _workflowTraceRepository.Queryable()
 			.LeftJoin<Workflow>((x, w) => x.WorkflowId == w.Id)
-			.Where((x, w) => w.ModuleCode == "OrderHandle" && x.BusinessType == EBusinessType.Send && x.Status != EWorkflowStepStatus.Handled && (x.Name == "派单组" || x.Name == "班长审批"))
+			.Where((x, w) => w.ModuleCode == WorkflowModuleConsts.OrderHandle && x.Status != EWorkflowStepStatus.Handled && (x.Name == "派单组" || x.Name == "班长审批"))
 			.Where((x, w) => x.CreationTime >= dto.StartTime.Value)
 			.Where((x, w) => x.CreationTime <= dto.EndTime.Value)
 			.WhereIF(!string.IsNullOrEmpty(dto.UserName), (x, w) => x.HandlerName == dto.UserName)
@@ -5643,7 +5643,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         
 		var items2 =  _workflowTraceRepository.Queryable()
 			.LeftJoin<Workflow>((x, w) => x.WorkflowId == w.Id)
-			.Where((x, w) => w.ModuleCode == WorkflowModuleConsts.OrderHandle && x.BusinessType == EBusinessType.Send &&
+			.Where((x, w) => w.ModuleCode == WorkflowModuleConsts.OrderHandle  &&
 								 x.Status == EWorkflowStepStatus.Handled
 								 && !string.IsNullOrEmpty(x.NextMainHandler) && x.NextMainHandler != OrgSeedData.CenterId && (x.Name == "派单组" || x.Name == "班长审批"))
 			.Where((x, w) => x.CreationTime >= dto.StartTime.Value)
@@ -5701,7 +5701,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
            var query = _workflowTraceRepository.Queryable()
                          .LeftJoin<Workflow>((x, w) => x.WorkflowId == w.Id)
                          .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 == WorkflowModuleConsts.OrderHandle && x.BusinessType == EBusinessType.Send && x.Status == EWorkflowStepStatus.Handled
                                               && !string.IsNullOrEmpty(x.NextMainHandler) && x.NextMainHandler != OrgSeedData.CenterId)
                          .Where((x, w, su) => x.CreationTime >= dto.StartTime.Value)
                          .Where((x, w, su) => x.CreationTime <= dto.EndTime.Value)
@@ -5722,7 +5722,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         }
         var  query2 = _workflowTraceRepository.Queryable()
                 .InnerJoin<SchedulingUser>((x, su) => x.HandlerId == su.UserId)
-                .Where((x, su) => x.ModuleCode == "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)
                 .WhereIF(dto.TitleCode.ToUpper() == "NOSENDORDERNUM", (x, su) => x.Status != EWorkflowStepStatus.Handled)
                 .WhereIF(dto.TitleCode.ToUpper() == "SENDORDERNUM", (x, su) => x.Status == EWorkflowStepStatus.Handled)
@@ -5740,7 +5740,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 		{
 			var query = _workflowTraceRepository.Queryable()
 						  .LeftJoin<Workflow>((x, w) => x.WorkflowId == w.Id)
-						  .Where((x, w) => w.ModuleCode == "OrderHandle" && x.BusinessType == EBusinessType.Send && x.Status == EWorkflowStepStatus.Handled
+						  .Where((x, w) => w.ModuleCode == WorkflowModuleConsts.OrderHandle && x.Status == EWorkflowStepStatus.Handled
 											   && !string.IsNullOrEmpty(x.NextMainHandler) && x.NextMainHandler != OrgSeedData.CenterId && (x.Name == "派单组" || x.Name == "班长审批"))
 						  .Where((x, w) => x.CreationTime >= dto.StartTime.Value)
 						  .Where((x, w) => x.CreationTime <= dto.EndTime.Value)
@@ -5761,7 +5761,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 			return query;
 		}
         var query2 = _workflowTraceRepository.Queryable()
-                .Where(x => x.ModuleCode == "OrderHandle" && x.BusinessType == EBusinessType.Send && (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)
                 .WhereIF(dto.TitleCode.ToUpper() == "NOSENDORDERNUM", x => x.Status != EWorkflowStepStatus.Handled)
                 .WhereIF(dto.TitleCode.ToUpper() == "SENDORDERNUM", x => x.Status == EWorkflowStepStatus.Handled)