Merge branch 'release/yibin' of http://110.188.24.182:10023/Fengwo/hotline into release/yibin

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

@@ -1430,14 +1430,14 @@ namespace Hotline.Api.Controllers.Bi
 
             foreach (var item in items)
             {
-                item.ZxAllTimes = Math.Round(((double)item.ZxAllTimes / 3600) * 100, 2) ;
-                item.JyAllTimes = Math.Round(((double)item.JyAllTimes / 3600) * 100, 2);
-                item.QzAllTimes = Math.Round(((double)item.QzAllTimes / 3600) * 100, 2);
-                item.ByAllTimes = Math.Round(((double)item.ByAllTimes / 3600) * 100, 2);
-                item.JbAllTimes = Math.Round(((double)item.JbAllTimes / 3600) * 100, 2);
-                item.TsAllTimes = Math.Round(((double)item.TsAllTimes / 3600) * 100, 2);
-                item.QtAllTimes = Math.Round(((double)item.QtAllTimes / 3600) * 100, 2);
-                item.YjAllTimes = Math.Round(((double)item.YjAllTimes / 3600) * 100, 2);
+                item.ZxAllTimes = Math.Round(((double)item.ZxAllTimes / 3600), 2);
+                item.JyAllTimes = Math.Round(((double)item.JyAllTimes / 3600), 2);
+                item.QzAllTimes = Math.Round(((double)item.QzAllTimes / 3600), 2);
+                item.ByAllTimes = Math.Round(((double)item.ByAllTimes / 3600), 2);
+                item.JbAllTimes = Math.Round(((double)item.JbAllTimes / 3600), 2);
+                item.TsAllTimes = Math.Round(((double)item.TsAllTimes / 3600), 2);
+                item.QtAllTimes = Math.Round(((double)item.QtAllTimes / 3600), 2);
+                item.YjAllTimes = Math.Round(((double)item.YjAllTimes / 3600), 2);
             }
 
 
@@ -1501,7 +1501,17 @@ namespace Hotline.Api.Controllers.Bi
                 var (_, items) = await query.ToPagedListAsync(dto.QueryDto, HttpContext.RequestAborted);
                 list = items;
             }
-
+            foreach (var item in list)
+            {
+                item.ZxAllTimes = Math.Round(((double)item.ZxAllTimes / 3600), 2);
+                item.JyAllTimes = Math.Round(((double)item.JyAllTimes / 3600), 2);
+                item.QzAllTimes = Math.Round(((double)item.QzAllTimes / 3600), 2);
+                item.ByAllTimes = Math.Round(((double)item.ByAllTimes / 3600), 2);
+                item.JbAllTimes = Math.Round(((double)item.JbAllTimes / 3600), 2);
+                item.TsAllTimes = Math.Round(((double)item.TsAllTimes / 3600), 2);
+                item.QtAllTimes = Math.Round(((double)item.QtAllTimes / 3600), 2);
+                item.YjAllTimes = Math.Round(((double)item.YjAllTimes / 3600), 2);
+            }
             //增加合计
             list.Add(new DepartmentAcceptanceTypeStatisticsDto
             {