派单量统计

src/Hotline.Api/config/appsettings.Development.json

@@ -1,7 +1,7 @@
 {
   "AllowedHosts": "*",
   "AppConfiguration": {
-    "AppScope": "ZiGong",
+    "AppScope": "LuZhou",
     "YiBin": {
       "AreaCode": "511500",
       "CallCenterType": "TianRun", //XunShi、WeiErXin、TianRun、XingTang

src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -5609,7 +5609,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)
+			   .Where((x, w) => w.ModuleCode == "OrderHandle" && x.BusinessType == EBusinessType.Send && 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)
@@ -5625,7 +5625,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)
+			.Where((x, w) => w.ModuleCode == "OrderHandle" && x.BusinessType == EBusinessType.Send && 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)
@@ -5644,7 +5644,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 			.LeftJoin<Workflow>((x, w) => x.WorkflowId == w.Id)
 			.Where((x, w) => w.ModuleCode == WorkflowModuleConsts.OrderHandle && x.BusinessType == EBusinessType.Send &&
 								 x.Status == EWorkflowStepStatus.Handled
-								 && !string.IsNullOrEmpty(x.NextMainHandler) && x.NextMainHandler != OrgSeedData.CenterId)
+								 && !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)
 			.GroupBy((x, w) => x.WorkflowId)
@@ -5664,26 +5664,27 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 				ReSendOrderNum = SqlFunc.AggregateDistinctCount(wt.ExternalId),
 			});
 
-		var items = await _orderRepository.UnionAll(itemsHandled, itemsNo,itemsHandled)
-		 .GroupBy(x => new { x.UserId, x.UserName, x.StepName })
-		 .Select(x => new BiOrderSendVo
-		 {
-			 UserId = x.UserId,
-			 UserName = x.UserName,
-			 StepName = x.StepName,
-			 SendOrderNum = SqlFunc.AggregateSum(x.SendOrderNum),
-			 NoSendOrderNum = SqlFunc.AggregateSum(x.NoSendOrderNum),
-			 ReSendOrderNum = SqlFunc.AggregateSum(x.ReSendOrderNum)
-		 }).MergeTable().Select(p=> new SendOrderReportOutDto {
-         UserId =p.UserId,
+        var items = await _orderRepository.UnionAll(itemsHandled, itemsNo, itemsHandled)
+         .GroupBy(x => new { x.UserId, x.UserName, x.StepName })
+         .Select(x => new BiOrderSendVo
+         {
+             UserId = x.UserId,
+             UserName = x.UserName,
+             StepName = x.StepName,
+             SendOrderNum = SqlFunc.AggregateSum(x.SendOrderNum),
+             NoSendOrderNum = SqlFunc.AggregateSum(x.NoSendOrderNum),
+             ReSendOrderNum = SqlFunc.AggregateSum(x.ReSendOrderNum)
+         }).ToListAsync();
+        var res = items.Select(p=> new SendOrderReportOutDto {
+             UserId =p.UserId,
 			 UserName = p.UserName,
 			 StepName = p.StepName,
 			 SendOrderNum = p.SendOrderNum,
              NoSendOrderNum = p.NoSendOrderNum,
 			 ReSendOrderNum = p.ReSendOrderNum,
              ChainRate = p.AccuracyRate
-		 }).ToListAsync();
-		return items;
+		 }).ToList();
+		return res;
 	}
 
 
@@ -5739,10 +5740,10 @@ 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
-											   && !string.IsNullOrEmpty(x.NextMainHandler) && x.NextMainHandler != OrgSeedData.CenterId)
+											   && !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)
-                          .WhereIF(dto.RoleName is "派单组", (x, w) => x.Name == "派单组")
+                          .WhereIF(dto.RoleName is "派单员", (x, w) => x.Name == "派单组")
 						  .WhereIF(dto.RoleName is "中心班长", (x, w) => x.Name == "班长审批")
 						  .GroupBy((x, w) => x.WorkflowId)
 						  .Having((x, w) => SqlFunc.AggregateCount(x.WorkflowId) > 1)
@@ -5759,11 +5760,11 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 			return query;
 		}
         var query2 = _workflowTraceRepository.Queryable()
-                .Where(x => x.ModuleCode == "OrderHandle" && x.BusinessType == EBusinessType.Send)
+                .Where(x => x.ModuleCode == "OrderHandle" && x.BusinessType == EBusinessType.Send && (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)
-                .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)
                 .Select(x => new { Id = x.ExternalId })