From ba870a4e62f5a4542064afafdbc9a7961062ea66 Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 23 Jun 2022 17:40:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/opendata/dto/result/CaResidentResultDTO.java | 10 ++++++++++ .../src/main/resources/mapper/CaResidentDao.xml | 5 ++++- .../com/epmet/service/impl/IcResiUserServiceImpl.java | 5 +++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java index a94247a9ba..2e32889995 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java @@ -16,6 +16,16 @@ public class CaResidentResultDTO implements Serializable { private String streetName; + /** + * 房屋id + */ + private String homeId; + + /** + * ic_resi_user表id + */ + private String icResiUserId; + /** * 人口ID */ diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml index c541483cf0..a0243f0dc8 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml @@ -103,10 +103,13 @@ ca.plat_code, vs.grid_name, vs.community_name as comName, - vs.street_name + vs.street_name, + cau.home_id, + cau.ic_resi_user_id FROM ca_resident as ca left join view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id + left join ca_resident_user as cau on cau.id_card = ca.id_card and del_flag = '0' ca.delete_flag = 'normal' diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 9172544598..2c7823ea61 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2655,8 +2655,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resultDTOResult = getGovOrgOpenFeignClient.getHouseAgencyInfo(houseInfo.getHomeId()); - entity.setGridId(resultDTOResult.getData().getGridId()); - entity.setPids(resultDTOResult.getData().getPids()); + HouseAgencyInfoResultDTO data = resultDTOResult.getData(); + entity.setGridId(data.getGridId()); + entity.setPids(data.getPids() + ":" + data.getAgencyId()); } else { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "房屋信息不完整", "房屋信息不完整"); }