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

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

@@ -1427,7 +1427,17 @@ namespace Hotline.Api.Controllers.Bi
         public async Task<object> DepartmentAcceptanceTypeStatistics([FromQuery] DepartmentKeyWordRequest dto)
         {
             var items = await _orderReportApplication.DepartmentAcceptanceTypeStatistics(dto).ToListAsync();
-
+            foreach (var item in items)
+            {
+                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);
+            }
             var total = new DepartmentAcceptanceTypeStatisticsDto
             {
                 OrgName = "合计",
@@ -1488,7 +1498,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
             {
@@ -2990,9 +3010,9 @@ namespace Hotline.Api.Controllers.Bi
         [HttpGet("hotspot-area-statistics")]
         public async Task<object> HotspotAndAreaStatistics([FromQuery] HotspotAndAreaStatisticsReq dto)
         {
-            var (areaList ,returnList) = await _orderApplication.HotspotAndAreaStatistics(dto);
+            var (areaList, returnList) = await _orderApplication.HotspotAndAreaStatistics(dto);
 
-            return new { AreaList = areaList, Data =  returnList };
+            return new { AreaList = areaList, Data = returnList };
         }
 
         /// <summary>
@@ -3001,24 +3021,24 @@ namespace Hotline.Api.Controllers.Bi
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost("hotspot-area-statistics-export")]
-        public async Task<FileStreamResult> HotspotAndAreaStatisticsExport([FromBody]HotspotAndAreaStatisticsReq dto)
+        public async Task<FileStreamResult> HotspotAndAreaStatisticsExport([FromBody] HotspotAndAreaStatisticsReq dto)
         {
-            var  returnList = await _orderApplication.HotspotAndAreaStatisticsExport(dto);
+            var returnList = await _orderApplication.HotspotAndAreaStatisticsExport(dto);
             var table = _orderApplication.InitHotspotTable(returnList, dto.AddColumnName, dto.HotspotLevel);
             var stream = ExcelHelper.CreateStream(table);
             return ExcelStreamResult(stream, "热点区域统计");
         }
 
-        /// <summary>
-        /// 受理类型统计
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        [HttpGet("accepttype-statistics")]
-        public async Task<List<AcceptTypeStatisticsDto>> AcceptTypeStatistics([FromQuery] AcceptTypeStatisticsReq dto)
-        {
+        ///// <summary>
+        ///// 受理类型统计
+        ///// </summary>
+        ///// <param name="dto"></param>
+        ///// <returns></returns>
+        //[HttpGet("accepttype-statistics")]
+        //public async Task<List<AcceptTypeStatisticsDto>> AcceptTypeStatistics([FromQuery] AcceptTypeStatisticsReq dto)
+        //{
 
-        }
+        //}
 
 
     }