网格员统计修改

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

@@ -1188,12 +1188,8 @@ public class GovOrgServiceImpl implements GovOrgService {
                     dto.setOrgId(grid.getId());
                     dto.setOrgType(OrgConstant.GRID);
                     dto.setOrgName(grid.getGridName());
-                    if (projectMap.containsKey(grid.getId())) {
-                        dto.setProjectCount(projectMap.get(grid.getId()));
-                    }
-                    if (closedMap.containsKey(grid.getId())) {
-                        dto.setClosedCount(closedMap.get(grid.getId()));
-                    }
+                    dto.setProjectCount(projectMap.getOrDefault(grid.getId(), NumConstant.ZERO));
+                    dto.setClosedCount(closedMap.getOrDefault(grid.getId(), NumConstant.ZERO));
                     if (memberMap.containsKey(grid.getId())) {
                         dto.setMemberCount(Math.toIntExact(memberMap.get(grid.getId())));
                         if (NumConstant.ZERO != dto.getMemberCount()) {
@@ -1296,12 +1292,9 @@ public class GovOrgServiceImpl implements GovOrgService {
             //统计关闭项目数
             Map<String, Integer> closedMap = govProjectService.getMemberClosedProjectMap(formDTO);
             result.getList().forEach(item -> {
-                if (projectMap.containsKey(item.getStaffId())) {
-                    item.setProjectCount(projectMap.get(item.getStaffId()));
-                }
-                if (projectMap.containsKey(item.getStaffId())) {
-                    item.setClosedCount(closedMap.get(item.getStaffId()));
-                }
+                item.setProjectCount(projectMap.getOrDefault(item.getStaffId(), NumConstant.ZERO));
+                item.setClosedCount(closedMap.getOrDefault(item.getStaffId(), NumConstant.ZERO));
+
                 if (OrgConstant.AGENCY.contains(formDTO.getOrgType())) {
                     AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(item.getOrgId());
                     if (null != agencyInfo) {