Merge remote-tracking branch 'remotes/origin/dev_project_statis'

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

@@ -487,24 +487,27 @@ public class GovOrgController {
             excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), OrgProjectDetailExcel.class).build();
             PageData<OrgProjectDetailResultDTO> page = null;
             WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
+            OrgProjectDetailExcel sum = new OrgProjectDetailExcel();
             do {
                 page = govOrgService.orgProjectDetailList(tokenDto, formDTO);
                 List<OrgProjectDetailExcel> list = ConvertUtils.sourceToTarget(page.getList(), OrgProjectDetailExcel.class);
                 list.forEach(item -> {
                     item.setIndex(i.getAndIncrement());
                 });
-                OrgProjectDetailExcel sum = new OrgProjectDetailExcel();
+
-                sum.setIndex(i.getAndIncrement());
+                sum.setMemberCount(sum.getMemberCount() + list.stream().mapToInt(OrgProjectDetailExcel::getMemberCount).sum());
-                sum.setOrgName("合计");
+                sum.setProjectCount(sum.getProjectCount() + list.stream().mapToInt(OrgProjectDetailExcel::getProjectCount).sum());
-                sum.setMemberCount(list.stream().mapToInt(OrgProjectDetailExcel::getMemberCount).sum());
+                sum.setClosedCount(sum.getClosedCount() + list.stream().mapToInt(OrgProjectDetailExcel::getClosedCount).sum());
-                sum.setProjectCount(list.stream().mapToInt(OrgProjectDetailExcel::getProjectCount).sum());
+                sum.setProjectAve(sum.getProjectAve() + list.stream().mapToInt(OrgProjectDetailExcel::getProjectAve).sum());
-                sum.setClosedCount(list.stream().mapToInt(OrgProjectDetailExcel::getClosedCount).sum());
+                sum.setClosedAve(sum.getClosedAve() + list.stream().mapToInt(OrgProjectDetailExcel::getClosedAve).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());
+            sum.setIndex(i.getAndIncrement());
+            sum.setOrgName("合计");
+            List<OrgProjectDetailExcel> list = new ArrayList<>();
+            list.add(sum);
+            excelWriter.write(list, writeSheet);
         } catch (EpmetException e) {
             response.reset();
             response.setCharacterEncoding("UTF-8");

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java

@@ -30,11 +30,11 @@ public class MemberProjectInfoExcel {
 
     @ColumnWidth(20)
     @ExcelProperty(value = "上报数量",order = 4)
-    private Integer projectCount;
+    private Integer projectCount = 0;
 
     @ColumnWidth(20)
     @ExcelProperty(value = "办结数",order = 5)
-    private Integer closedCount;
+    private Integer closedCount = 0;
 
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java

@@ -26,22 +26,22 @@ public class OrgProjectDetailExcel {
 
     @ColumnWidth(20)
     @ExcelProperty(value = "网格员数",order = 3)
-    private Integer memberCount;
+    private Integer memberCount = 0;
 
     @ColumnWidth(20)
     @ExcelProperty(value = "上报数量",order = 4)
-    private Integer projectCount;
+    private Integer projectCount = 0;
 
     @ColumnWidth(20)
     @ExcelProperty(value = "办结数",order = 5)
-    private Integer closedCount;
+    private Integer closedCount = 0;
 
     @ColumnWidth(20)
     @ExcelProperty(value = "人均上报",order = 6)
-    private Integer projectAve;
+    private Integer projectAve = 0;
 
     @ColumnWidth(20)
     @ExcelProperty(value = "人均办结",order = 7)
-    private Integer closedAve;
+    private Integer closedAve = 0;
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -1264,7 +1264,7 @@ public class GovOrgServiceImpl implements GovOrgService {
     public PageData<MemberProjectInfoResultDTO> memberProjectInfoList(TokenDto tokenDto, OrgStatisticsFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         PageData<MemberProjectInfoResultDTO> result;
-        if (StringUtils.isBlank(formDTO.getAgencyId())) {
+        if (StringUtils.isBlank(formDTO.getOrgId())) {
             CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
             if (null == staffInfo) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败");