src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -40,7 +40,7 @@ namespace Hotline.Api.Controllers.Bi
         private readonly IRepository<OrderDelay> _orderDelayRepository;
         private readonly IMapper _mapper;
         private readonly IRepository<WorkflowCountersign> _workflowCountersignRepository;
-        private readonly IRepository<WorkflowStep> _workflowStepRepository;
+        private readonly IRepository<WorkflowStepHandler> _workflowStepHandleRepository;
         private readonly IRepository<OrderSpecial> _orderSpecialRepository;
         private readonly IRepository<OrderVisit> _orderVisitRepository;
         private readonly IRepository<TrCallRecord> _trCallRecordRepository;
@@ -1557,23 +1557,23 @@ namespace Hotline.Api.Controllers.Bi
                     DelayWait = SqlFunc.AggregateSum(SqlFunc.IIF(!o.IsHandled, 1, 0)),
                 }).MergeTable();
 
-            _workflowStepRepository.Queryable()
-                .Where(d => d.ModuleCode == WorkflowModuleConsts.OrderHandle &&
-                            d.CountersignPosition == ECountersignPosition.Multi &&
-                            d.CountersignPosition == ECountersignPosition.Single)
-                .Where(x => x.CreationTime >= StartDate && x.CreationTime <= EndDate)
-                .GroupBy(d => new { d.StepHandlers.First().OrgId, d.StepHandlers.First().OrgName })
+            _workflowStepHandleRepository.Queryable()
+                .Where(d => d.WorkflowStep.ModuleCode == WorkflowModuleConsts.OrderHandle &&
+                            d.WorkflowStep.CountersignPosition == ECountersignPosition.Multi &&
+                            d.WorkflowStep.CountersignPosition == ECountersignPosition.Single &&
+                            d.WorkflowStep.CreationTime >= StartDate && d.WorkflowStep.CreationTime <= EndDate)
+                .GroupBy(d => new { d.OrgId, d.OrgName })
                 .Select(d => new DepartmentalProcessingStatisticsDataDto
                 {
-                    OrgCode = d.StepHandlers.First().OrgId,
+                    OrgCode = d.OrgId,
                     HQYBOverdue =
                         SqlFunc.AggregateSum(SqlFunc.IIF(
-                            d.Status == EWorkflowStepStatus.Handled && d.HandleTime > d.StepExpiredTime, 1, 0)),
+                            d.WorkflowStep.Status == EWorkflowStepStatus.Handled && d.WorkflowStep.HandleTime > d.WorkflowStep.StepExpiredTime, 1, 0)),
                     HQZBOverdue =
                         SqlFunc.AggregateSum(SqlFunc.IIF(
-                            d.Status != EWorkflowStepStatus.Handled && DateTime.Now >= d.StepExpiredTime, 1, 0)),
-                    DelayEnd = SqlFunc.AggregateSum(SqlFunc.IIF(d.Status == EWorkflowStepStatus.Handled, 1, 0)),
-                    DelayWait = SqlFunc.AggregateSum(SqlFunc.IIF(d.Status != EWorkflowStepStatus.Handled, 1, 0)),
+                            d.WorkflowStep.Status != EWorkflowStepStatus.Handled && DateTime.Now >= d.WorkflowStep.StepExpiredTime, 1, 0)),
+                    DelayEnd = SqlFunc.AggregateSum(SqlFunc.IIF(d.WorkflowStep.Status == EWorkflowStepStatus.Handled, 1, 0)),
+                    DelayWait = SqlFunc.AggregateSum(SqlFunc.IIF(d.WorkflowStep.Status != EWorkflowStepStatus.Handled, 1, 0)),
                 });