Merge branch 'release_20250306' of Fengwo/hotline into release

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

@@ -2997,14 +2997,14 @@ namespace Hotline.Api.Controllers.Bi
 
             foreach (var item in items)
             {
-                item.ZxAllTimes = Math.Round(((double)item.ZxAllTimes / 3600 / 24), 2);
-                item.JyAllTimes = Math.Round(((double)item.JyAllTimes / 3600 / 24), 2);
-                item.QzAllTimes = Math.Round(((double)item.QzAllTimes / 3600 / 24), 2);
-                item.ByAllTimes = Math.Round(((double)item.ByAllTimes / 3600 / 24), 2);
-                item.JbAllTimes = Math.Round(((double)item.JbAllTimes / 3600 / 24), 2);
-                item.TsAllTimes = Math.Round(((double)item.TsAllTimes / 3600 / 24), 2);
-                item.QtAllTimes = Math.Round(((double)item.QtAllTimes / 3600 / 24), 2);
-                item.YjAllTimes = Math.Round(((double)item.YjAllTimes / 3600 / 24), 2);
+                item.ZxAllTimes = Math.Round(((double)item.ZxAllTimes / 3600 / 8), 2);
+                item.JyAllTimes = Math.Round(((double)item.JyAllTimes / 3600 / 8), 2);
+                item.QzAllTimes = Math.Round(((double)item.QzAllTimes / 3600 / 8), 2);
+                item.ByAllTimes = Math.Round(((double)item.ByAllTimes / 3600 / 8), 2);
+                item.JbAllTimes = Math.Round(((double)item.JbAllTimes / 3600 / 8), 2);
+                item.TsAllTimes = Math.Round(((double)item.TsAllTimes / 3600 / 8), 2);
+                item.QtAllTimes = Math.Round(((double)item.QtAllTimes / 3600 / 8), 2);
+                item.YjAllTimes = Math.Round(((double)item.YjAllTimes / 3600 / 8), 2);
             }
 
 
@@ -3070,14 +3070,14 @@ namespace Hotline.Api.Controllers.Bi
             }
             foreach (var item in list)
             {
-                item.ZxAllTimes = Math.Round(((double)item.ZxAllTimes / 3600 / 24), 2);
-                item.JyAllTimes = Math.Round(((double)item.JyAllTimes / 3600 / 24), 2);
-                item.QzAllTimes = Math.Round(((double)item.QzAllTimes / 3600 / 24), 2);
-                item.ByAllTimes = Math.Round(((double)item.ByAllTimes / 3600 / 24), 2);
-                item.JbAllTimes = Math.Round(((double)item.JbAllTimes / 3600 / 24), 2);
-                item.TsAllTimes = Math.Round(((double)item.TsAllTimes / 3600 / 24), 2);
-                item.QtAllTimes = Math.Round(((double)item.QtAllTimes / 3600 / 24), 2);
-                item.YjAllTimes = Math.Round(((double)item.YjAllTimes / 3600 / 24), 2);
+                item.ZxAllTimes = Math.Round(((double)item.ZxAllTimes / 3600 / 8), 2);
+                item.JyAllTimes = Math.Round(((double)item.JyAllTimes / 3600 / 8), 2);
+                item.QzAllTimes = Math.Round(((double)item.QzAllTimes / 3600 / 8), 2);
+                item.ByAllTimes = Math.Round(((double)item.ByAllTimes / 3600 / 8), 2);
+                item.JbAllTimes = Math.Round(((double)item.JbAllTimes / 3600 / 8), 2);
+                item.TsAllTimes = Math.Round(((double)item.TsAllTimes / 3600 / 8), 2);
+                item.QtAllTimes = Math.Round(((double)item.QtAllTimes / 3600 / 8), 2);
+                item.YjAllTimes = Math.Round(((double)item.YjAllTimes / 3600 / 8), 2);
             }
             //增加合计
             list.Add(new DepartmentAcceptanceTypeStatisticsDto

src/Hotline.Share/Dtos/CallCenter/CenterReportStatisticsDto.cs

@@ -568,7 +568,7 @@ namespace Hotline.Share.Dtos.CallCenter
 
         public double GetCompletedAgingMean() {
 			if (OrderCount > 0 && CompletedAging > 0)
-				return Math.Round(((CompletedAging.Value / OrderCount) / 3600 / 24), 2);
+				return Math.Round(((CompletedAging.Value / OrderCount) / 3600 / 8), 2);
 			return 0;
 		}
 
@@ -590,7 +590,7 @@ namespace Hotline.Share.Dtos.CallCenter
 		public double GetCityCompletedAgingMean()
 		{
 			if (CityOrderCount > 0 && CityCompletedAging > 0)
-				return Math.Round(((CityCompletedAging.Value / CityOrderCount) / 3600 / 24), 2);
+				return Math.Round(((CityCompletedAging.Value / CityOrderCount) / 3600 / 8), 2);
 			return 0;
 		}
 
@@ -612,7 +612,7 @@ namespace Hotline.Share.Dtos.CallCenter
 		public double GetCountyCompletedAgingMean()
 		{
 			if (CountyOrderCount > 0 && CountyCompletedAging > 0)
-				return Math.Round(((CountyCompletedAging.Value / CountyOrderCount) / 3600 / 24), 2);
+				return Math.Round(((CountyCompletedAging.Value / CountyOrderCount) / 3600 / 8), 2);
 			return 0;
 		}
 
@@ -634,7 +634,7 @@ namespace Hotline.Share.Dtos.CallCenter
 		public double GetCenterCompletedAgingMean()
 		{
 			if (CenterOrderCount > 0 && CenterCompletedAging > 0)
-				return Math.Round(((CenterCompletedAging.Value / CenterOrderCount) / 3600 / 24), 2);
+				return Math.Round(((CenterCompletedAging.Value / CenterOrderCount) / 3600 / 8), 2);
 			return 0;
 		}
 	}

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -1607,7 +1607,7 @@ namespace Hotline.FlowEngine.Workflows
                               workflow.Steps.MaxBy(d => d.CreationTime);
 
             //update uncomplete traces
-            var uncompleteTraces = workflow.Traces.Where(d => d.Status != EWorkflowStepStatus.Handled).ToList();
+            var uncompleteTraces = workflow.Traces.Where(d => d.Status != EWorkflowStepStatus.Handled && d.TraceStyle == ETraceStyle.Flow).ToList();
             if (uncompleteTraces.Any())
             {
                 foreach (var trace in uncompleteTraces)
@@ -1624,7 +1624,7 @@ namespace Hotline.FlowEngine.Workflows
             }
             else
             {
-                var endTrace = workflow.Traces.Where(d => d.StepType == EStepType.End).MaxBy(d => d.CreationTime);
+                var endTrace = workflow.Traces.Where(d => d.StepType == EStepType.End && d.TraceStyle == ETraceStyle.Flow).MaxBy(d => d.CreationTime);
                 if (endTrace is not null)
                 {
                     endTrace.Opinion += ("\r\n" + dto.Opinion);