总计 人均

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

@@ -498,13 +498,15 @@ public class GovOrgController {
                 sum.setMemberCount(sum.getMemberCount() + list.stream().mapToInt(OrgProjectDetailExcel::getMemberCount).sum());
                 sum.setProjectCount(sum.getProjectCount() + list.stream().mapToInt(OrgProjectDetailExcel::getProjectCount).sum());
                 sum.setClosedCount(sum.getClosedCount() + list.stream().mapToInt(OrgProjectDetailExcel::getClosedCount).sum());
-                sum.setProjectAve(sum.getProjectAve() + list.stream().mapToInt(OrgProjectDetailExcel::getProjectAve).sum());
-                sum.setClosedAve(sum.getClosedAve() + list.stream().mapToInt(OrgProjectDetailExcel::getClosedAve).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("合计");
+            if (NumConstant.ZERO != sum.getMemberCount()) {
+                sum.setProjectAve(sum.getProjectCount()/sum.getMemberCount());
+                sum.setClosedAve(sum.getClosedCount()/sum.getMemberCount());
+            }
             List<OrgProjectDetailExcel> list = new ArrayList<>();
             list.add(sum);
             excelWriter.write(list, writeSheet);