组织项目统计,网格员项目统计

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -483,7 +483,7 @@ public class GovOrgController {
         ExcelWriter excelWriter = null;
         AtomicInteger i = new AtomicInteger(1);
         try {
-            String fileName = "组织项目统计.xlsx";
+            String fileName = "组织事件统计.xlsx";
             excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), OrgProjectDetailExcel.class).build();
             PageData<OrgProjectDetailResultDTO> page = null;
             WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
@@ -493,6 +493,15 @@ public class GovOrgController {
                 list.forEach(item -> {
                     item.setIndex(i.getAndIncrement());
                 });
+                OrgProjectDetailExcel sum = new OrgProjectDetailExcel();
+                sum.setIndex(i.getAndIncrement());
+                sum.setOrgName("合计");
+                sum.setMemberCount(list.stream().mapToInt(OrgProjectDetailExcel::getMemberCount).sum());
+                sum.setProjectCount(list.stream().mapToInt(OrgProjectDetailExcel::getProjectCount).sum());
+                sum.setClosedCount(list.stream().mapToInt(OrgProjectDetailExcel::getClosedCount).sum());
+                sum.setProjectAve(list.stream().mapToInt(OrgProjectDetailExcel::getProjectAve).sum());
+                sum.setClosedAve(list.stream().mapToInt(OrgProjectDetailExcel::getClosedAve).sum());
+                list.add(sum);
                 excelWriter.write(list, writeSheet);
                 formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
             } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDTO.getPageSize());
@@ -523,7 +532,7 @@ public class GovOrgController {
         ExcelWriter excelWriter = null;
         AtomicInteger i = new AtomicInteger(1);
         try {
-            String fileName = "网格员项目统计.xlsx";
+            String fileName = "网格员事件统计.xlsx";
             excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), MemberProjectInfoExcel.class).build();
             PageData<MemberProjectInfoResultDTO> page = null;
             WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();