修改网格中心点时去掉 参数里的委会

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java

@@ -144,8 +144,9 @@ public class EIDimServiceImpl implements EIDimService {
             if (grid.getCustomerId().equals(param.getCustomerId())) {
                 AtomicInteger integer = new AtomicInteger(0);
                 param.getCenterDataList().forEach(o -> {
-                    if (grid.getGridName().contains(o.getTitle())) {
-                        Integer effectRow = screenCustomerGridService.updateCenterPointByName(param.getCustomerId(), o.getTitle(), o.getCenter());
+                    String title = o.getTitle().replace("委会","");
+                    if (grid.getGridName().contains(title)) {
+                        Integer effectRow = screenCustomerGridService.updateCenterPointByName(param.getCustomerId(), title, o.getCenter());
                         integer.addAndGet(effectRow);
                     }
                     result.put(grid.getGridId(), integer.intValue());

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java

@@ -182,11 +182,7 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon
             o.setDataEndTime(dimId);
 
             //For:06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数
-            if(gridManagerMap.containsKey(orgId)){
-                o.setGridMemberTotal(gridManagerMap.get(orgId));
-            }else{
-                o.setGridMemberTotal(NumConstant.ZERO);
-            }
+            o.setGridMemberTotal(gridManagerMap.getOrDefault(orgId, NumConstant.ZERO));
         });
         return result;
     }