From cb49be18886f91a002c8891b3f45a87a2835e101 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 17 Feb 2022 17:53:52 +0800 Subject: [PATCH 1/3] emm --- .../model/ImportBuildingInfoListener.java | 2 +- .../epmet/model/ImportHouseInfoListener.java | 22 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java index 768f41ad5b..594b64e672 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java @@ -72,7 +72,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener Date: Thu, 17 Feb 2022 17:54:40 +0800 Subject: [PATCH 2/3] emm --- .../src/main/java/com/epmet/model/ImportHouseInfoListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index a432741869..bcac2e5a4b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -97,7 +97,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener Date: Thu, 17 Feb 2022 18:20:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=83=85=E5=86=B5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C=E6=AC=A1?= =?UTF-8?q?=E6=95=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datastats/impl/DataStatsServiceImpl.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 12597f68af..0803e2c359 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -2097,19 +2097,21 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve } //例行工作次数累加 int patrolRoutineWorkTimes = NumConstant.ZERO; - workCountListTemp = workCountMap.get(org.getOrgId()); - if (CollectionUtils.isNotEmpty(workCountListTemp)) { - if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) { - for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) { - patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes(); - set.add(work.getStaffId()); - } - } else { - if (!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) { + if (workCountMap != null){ + workCountListTemp = workCountMap.get(org.getOrgId()); + if (CollectionUtils.isNotEmpty(workCountListTemp)) { + if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) { for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) { patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes(); set.add(work.getStaffId()); } + } else { + if (!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) { + for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) { + patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes(); + set.add(work.getStaffId()); + } + } } } }