新增返回字段

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
      */

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'
             <where>
                 ca.delete_flag = 'normal'
                 <if test="residentName != null and residentName != ''">

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -2655,8 +2655,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             entity.setAgencyId(houseInfo.getAgencyId());
             // 根据homeId获取gridId和pids
             Result<HouseAgencyInfoResultDTO> resultDTOResult = getGovOrgOpenFeignClient.getHouseAgencyInfo(houseInfo.getHomeId());
-            entity.setGridId(resultDTOResult.getData().getGridId());
+            HouseAgencyInfoResultDTO data = resultDTOResult.getData();
-            entity.setPids(resultDTOResult.getData().getPids());
+            entity.setGridId(data.getGridId());
+            entity.setPids(data.getPids() + ":" + data.getAgencyId());
         } else {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "房屋信息不完整", "房屋信息不完整");
         }