From 135936f874c50c409e5538cdc992fef46bfab04f Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 9 Jun 2021 13:30:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E6=A0=BC=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E7=82=B9=E6=97=B6=E5=8E=BB=E6=8E=89=20=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=87=8C=E7=9A=84=E5=A7=94=E4=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/EIDimServiceImpl.java | 5 +++-- .../stats/impl/ScreenCentralZoneDataExtractServiceImpl.java | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java index 8b5b67fe7d..c846f14f30 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java +++ b/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()); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java index ff368ab5da..36511421f3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java +++ b/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; }