Merge remote-tracking branch 'origin/dev_export_excel' into dev_export_excel

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java

@@ -34,4 +34,6 @@ public class CustomerDataManageResultDTO {
     //巡查时长
     private String patrolDuration;
 
+    private Integer patrolDurationInteger;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -1856,26 +1856,26 @@ public class DataStatsServiceImpl implements DataStatsService {
      */
     @Override
     public void CustomerDataManage(CustomerDataManageFormDTO formDTO, HttpServletResponse response) throws Exception {
-        List<CustomerDataManageExcel> l = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(l)){
-            CustomerDataManageExcel d3 = new CustomerDataManageExcel();
-            d3.setOrgName("合计");
-            d3.setUserCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getUserCount)));
-            d3.setResidentCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getResidentCount)));
-            d3.setPartyMemberCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPartyMemberCount)));
-            d3.setGroupCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getGroupCount)));
-            d3.setTopicCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getTopicCount)));
-            d3.setIssueCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getIssueCount)));
-            d3.setProjectCount(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getProjectCount)));
-            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.setPatrolDurationInteger(l.stream().collect(Collectors.summingInt(CustomerDataManageExcel::getPatrolDurationInteger)));
-            d3.setPatrolDuration(getHm(d3.getPatrolDurationInteger()));
-            l.add(d3);
+        List<CustomerDataManageResultDTO> result = operateExport(formDTO);
+        if (!CollectionUtils.isEmpty(result)){
+            CustomerDataManageResultDTO c = new CustomerDataManageResultDTO();
+            c.setOrgName("合计");
+            c.setUserCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getUserCount)));
+            c.setResidentCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getResidentCount)));
+            c.setPartyMemberCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPartyMemberCount)));
+            c.setGroupCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getGroupCount)));
+            c.setTopicCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getTopicCount)));
+            c.setIssueCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getIssueCount)));
+            c.setProjectCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getProjectCount)));
+            c.setClosedProjectCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getClosedProjectCount)));
+            c.setPatrolPeopleCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPatrolPeopleCount)));
+            c.setPatrolCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPatrolCount)));
+            c.setPatrolDurationInteger(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPatrolDurationInteger)));
+            c.setPatrolDuration(getHm(c.getPatrolDurationInteger()));
+            result.add(c);
         }
         String fileName = excelName(formDTO);
-        ExcelUtils.exportExcelToTargetDisposeAll(response,fileName,l, CustomerDataManageExcel.class);
+        ExcelUtils.exportExcelToTargetDisposeAll(response,fileName,result, CustomerDataManageExcel.class);
     }
 
     /**