From f063be58f84587607623e6115fa21a2f608f3138 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 26 Nov 2021 15:08:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/basereport/result/EventInfoResultDTO.java | 2 +- .../java/com/epmet/service/impl/DataReportingServiceImpl.java | 2 ++ .../opendata/service/impl/BaseDisputeProcessServiceImpl.java | 2 +- .../java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/result/EventInfoResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/result/EventInfoResultDTO.java index 4396b6cb07..4b7aeea782 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/result/EventInfoResultDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/result/EventInfoResultDTO.java @@ -24,7 +24,7 @@ public class EventInfoResultDTO implements Serializable { */ private String customerId; - private Integer detpId; + private String orgId; private String reporterId; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java index bda9076789..2fbd1d0037 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java @@ -169,10 +169,12 @@ public class DataReportingServiceImpl implements DataReportingService { EventInfoResultDTO dto = getEventInfoResultDTO(project, epmetCodeMap, codeMap); if (OrgTypeConstant.AGENCY.equals(project.getOrgType())) { ScreenCustomerAgencyEntity agency = screenCustomerAgencyService.getAgencyById(project.getOrgId()); + dto.setOrgId(project.getOrgId()); dto.setOrgCode(agency.getCode()); dto.setOrgName(agency.getAgencyName()); } else { ScreenCustomerGridDTO grid = screenCustomerGridService.getGridById(project.getOrgId()); + dto.setOrgId(project.getOrgId()); dto.setOrgCode(grid.getCode()); dto.setOrgName(grid.getGridName()); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java index e20b533616..983bbf1916 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java @@ -94,7 +94,7 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl resolveList = list.stream().map(item -> { BaseConflictsResolveEntity entity = new BaseConflictsResolveEntity(); entity.setId(item.getId()); - entity.setGridId(deptMap.get(item.getOrgCode())); + entity.setGridId(deptMap.get(item.getOrgId())); entity.setGridName(item.getOrgName()); entity.setEventName(item.getEventName()); entity.setHappenDate(item.getHappenDate()); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java index bf699eb3b9..cbbb536124 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java @@ -109,7 +109,7 @@ public class ExDeptServiceImpl extends BaseServiceImpl if (CollectionUtils.isEmpty(entityList)) { return Collections.emptyMap(); } - return entityList.stream().collect(Collectors.toMap(ExDeptEntity::getGridCode, ExDeptEntity::getDeptId, (key1, key2) -> key2)); + return entityList.stream().collect(Collectors.toMap(ExDeptEntity::getQxDeptId, ExDeptEntity::getDeptId, (key1, key2) -> key2)); } } \ No newline at end of file From cfbb27b6bf3c58a26b9e7d7560840b83d973f2e1 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 26 Nov 2021 15:21:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BaseDisputeProcessServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java index 983bbf1916..7c9a1aeabf 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java @@ -100,13 +100,14 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl