From c03c83ea7a5b030c82be070ea02af50779ac6837 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 13 Sep 2021 10:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/utils/ExcelUtils.java |  3 ++-
 .../datastats/impl/DataStatsServiceImpl.java  | 27 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
index 6eef730ad4..bc2659eccc 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
@@ -113,8 +113,9 @@ public class ExcelUtils {
         sheet1.setDefaultRowHeight((short)(2*256));
         response.setCharacterEncoding("UTF-8");
         response.setHeader("content-Type", "application/vnd.ms-excel");
+        fileName = fileName + ".xls";
         response.setHeader("Content-Disposition",
-                "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xls");
+                "attachment;filename=" +fileName);
         ServletOutputStream out = response.getOutputStream();
         workbook.write(out);
         out.flush();
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 062a51d105..2ee14db994 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1870,13 +1870,38 @@ public class DataStatsServiceImpl implements DataStatsService {
             d3.setClosedProjectCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getClosedProjectCount)));
             d3.setPatrolPeopleCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPatrolPeopleCount)));
             d3.setPatrolCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPatrolCount)));
-            d3.setPatrolDuration("");
+            d3.setPatrolDurationInteger(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPatrolDurationInteger)));
+            d3.setPatrolDuration(getHm(d3.getPatrolDurationInteger()));
             l.add(d3);
         }
         String fileName = excelName(formDTO);
         ExcelUtils.exportExcelToTargetDisposeAll(response,fileName,l, CustomerDataManageExcel.class);
     }
 
+    /**
+     * @Description  秒转换时分
+     * @Param seconds
+     * @author zxc
+     * @date 2021/9/13 10:03 上午
+     */
+    public String getHm(Integer seconds){
+        String result = "0分钟";
+        if (seconds >= NumConstant.SIXTY) {
+            Integer hours = seconds / 3600;
+            Integer minutes = seconds % 3600 / 60;
+            result = (hours < NumConstant.ONE ? "" : hours + "小时") + (minutes < NumConstant.ONE ? "" : minutes + "分钟");
+        }else if (seconds < NumConstant.SIXTY && seconds > NumConstant.ZERO){
+            result = "1分钟";
+        }
+        return result;
+    }
+
+    /**
+     * @Description  表头获取
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/13 10:02 上午
+     */
     public String excelName(CustomerDataManageFormDTO formDTO){
         StringBuffer s = new StringBuffer();
         String agencyName = indexService.selectAgencyNameByAgencyId(formDTO.getAgencyId());