From 414b68908c613cf9620fd0640cce29ad36f5397f Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Thu, 15 Sep 2022 09:08:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=9B=BE=E8=B0=B1-=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E8=AF=A6=E6=83=85=E9=87=8C=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF=E7=94=B1=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9C=AC=E4=BA=BA=E6=98=AF=E6=88=BF=E4=B8=9C=E7=9A=84=E6=88=BF?=
 =?UTF-8?q?=E5=B1=8B=E4=BF=A1=E6=81=AF=E6=94=B9=E4=B8=BA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E4=BA=BA=E5=91=98=E5=B1=85=E4=BD=8F=E7=9A=84?=
 =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/PersonDataResultDTO.java    |  3 +++
 .../service/impl/IcResiUserServiceImpl.java      | 16 +++++++++++++++-
 .../src/main/resources/mapper/IcResiUserDao.xml  |  4 +++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
index 5e739016b3..e9873965b7 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
@@ -95,4 +95,7 @@ public class PersonDataResultDTO implements Serializable {
 
     @JsonIgnore
     private String gridId;
+
+    @JsonIgnore
+    private String homeId;
 }
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 5b1fd7f8f1..ec9bf3043c 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
@@ -1143,11 +1143,25 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         personData.setIcResiUserId(formDTO.getUserId());
 
         // 房屋信息查询
-        Result<List<String>> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard(), formDTO.getCustomerId());
+        //2022.9.14 应产品要求之前返的是这个人是房东的房屋信息，现在改成返回这个人当前居住的房屋信息  syc
+        /*Result<List<String>> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard(), formDTO.getCustomerId());
         if (!listResult.success()) {
             throw new RenException("查询房屋信息失败");
         }
         personData.setHouseInfo(listResult.getData());
+        */
+        Set<String> houseIds = new HashSet<>();
+        houseIds.add(personData.getHomeId());
+        Result<List<HouseInfoDTO>> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId());
+        if (!houseInfoRes.success()) {
+            throw new RenException("查询房屋信息失败");
+        }
+        List<String> houseInfo = new ArrayList<>();
+        if(null!=houseInfoRes.getData()&& !CollectionUtils.isEmpty(houseInfoRes.getData())){
+            houseInfo.add(houseInfoRes.getData().get(0).getAllName());
+        }
+        //2022.9.14  end
+        personData.setHouseInfo(houseInfo);
 
         // 志愿者处理
         if (personData.getIsVolunteer().equals(NumConstant.ONE_STR)) {
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index fe17400279..4674e07b37 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -300,6 +300,7 @@
         <result column="isTenant" property="isTenant"/>
         <result column="CUSTOMER_ID" property="customerId"/>
         <result column="GRID_ID" property="gridId"/>
+        <result column="HOME_ID" property="homeId"/>
         <collection property="financialSituation" ofType="com.epmet.dto.FinancialSituationDTO">
             <result column="YSR" property="monthlyIncome"/>
             <result column="TXJE" property="retirementAmount"/>
@@ -316,7 +317,8 @@
             IS_TENANT as isTenant,
             IFNULL(IS_VOLUNTEER,'0') AS isVolunteer,
             CUSTOMER_ID,
-            GRID_ID
+            GRID_ID,
+            HOME_ID
         FROM ic_resi_user
         WHERE DEL_FLAG = '0'
           AND ID = #{userId}