From abb44b810fafcf54f3f77cb27db73058656daf8e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 13 Apr 2023 09:56:35 +0800
Subject: [PATCH] =?UTF-8?q?/epmetuser/icresiuser/portrayal-list=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=89=80=E5=B1=9E=E5=B0=8F=E5=8C=BA=E3=80=81=E6=A5=BC?=
 =?UTF-8?q?=E6=A0=8B=E3=80=81=E5=8D=95=E5=85=83=E3=80=81=E9=97=A8=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/resi/ResiPortrayalDetailDTO.java   | 44 ++++++++++++++++++-
 .../service/impl/IcResiUserServiceImpl.java   | 39 ++++++++++++----
 .../main/resources/mapper/IcResiUserDao.xml   |  8 +++-
 3 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java
index 6d7f2b1a63..caf44943fe 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java
@@ -12,6 +12,11 @@ import lombok.Data;
  */
 @Data
 public class ResiPortrayalDetailDTO {
+    /**
+     * 居民id
+     */
+    @ExcelIgnore
+    private String icResiUserId;
 
     @ExcelIgnore
     private String gridId;
@@ -21,10 +26,45 @@ public class ResiPortrayalDetailDTO {
     private String gridName;
 
     /**
-     * 居民id
+     * 所属小区ID
      */
     @ExcelIgnore
-    private String icResiUserId;
+    private String villageId;
+    @ExcelIgnore
+    private String villageName;
+    /**
+     * 所属楼宇Id
+     */
+    @ExcelIgnore
+    private String buildId;
+    @ExcelIgnore
+    private String buildName;
+    /**
+     * 单元id
+     */
+    @ExcelIgnore
+    private String unitId;
+    @ExcelIgnore
+    private String unitName;
+
+    /**
+     * 所属家庭Id
+     */
+    @ExcelIgnore
+    private String homeId;
+
+    @ExcelProperty(value = "所属房屋")
+    @ColumnWidth(30)
+    private String homeName;
+
+    /**
+     * 所属家庭号
+     * 101
+     */
+    @ExcelIgnore
+    private String doorName;
+
+
     /**
      * 姓名
      */
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 dd5b44c54a..22e10b0101 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
@@ -4030,14 +4030,37 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
         PageHelper.startPage(pageNo, pageSize);
         List<ResiPortrayalDetailDTO> list = baseDao.selectPortrayalResiList(customerId, orgId, orgType,codeType, code);
-        list.forEach(resi -> {
-            // 学历名称
-            resi.setEducationName(educationMap.get(resi.getEducationCode()));
-            GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(resi.getGridId());
-            if (null != gridInfoCache) {
-                resi.setGridName(gridInfoCache.getGridNamePath());
-            }
-        });
+        if(CollectionUtils.isNotEmpty(list)){
+            Set<String> houseIds=list.stream().map(m -> m.getHomeId()).collect(Collectors.toSet());
+            //查询房子名称
+            Result<List<HouseInfoDTO>> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, customerId);
+            List<HouseInfoDTO> houseInfoDTOList = houseInfoRes.success() && !CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>();
+            Map<String, HouseInfoDTO> houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity()));
+
+            list.forEach(resi -> {
+                // 学历名称
+                resi.setEducationName(educationMap.get(resi.getEducationCode()));
+                GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(resi.getGridId());
+                if (null != gridInfoCache) {
+                    resi.setGridName(gridInfoCache.getGridNamePath());
+                }
+                if (houseInfoMap.containsKey(resi.getHomeId()) && null != houseInfoMap.get(resi.getHomeId())) {
+                    HouseInfoDTO houseInfoDTO = houseInfoMap.get(resi.getHomeId());
+                    String buildName = StringUtils.isNotBlank(houseInfoDTO.getBuildingName()) ? houseInfoDTO.getBuildingName() : StrConstant.EPMETY_STR;
+                    resi.setBuildName(buildName);
+
+                    String neighBorName = StringUtils.isNotBlank(houseInfoDTO.getNeighborHoodName()) ? houseInfoDTO.getNeighborHoodName() : StrConstant.EPMETY_STR;
+                    resi.setVillageName(neighBorName);
+
+                    String unitName = StringUtils.isNotBlank(houseInfoDTO.getUnitName()) ? houseInfoDTO.getUnitName() : StrConstant.EPMETY_STR;
+                    resi.setUnitName(unitName);
+
+                    String doorName = StringUtils.isNotBlank(houseInfoDTO.getDoorName()) ? houseInfoDTO.getDoorName() : StrConstant.EPMETY_STR;
+                    resi.setDoorName(doorName);
+                    resi.setHomeName(neighBorName.concat(buildName).concat(unitName).concat(doorName));
+                }
+            });
+        }
         PageInfo<ResiPortrayalDetailDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal(), pageSize);
     }
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 ff5f663dc9..b3812ddf38 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
@@ -1591,6 +1591,11 @@
     <select id="selectPortrayalResiList" parameterType="map" resultType="com.epmet.dto.result.resi.ResiPortrayalDetailDTO">
         SELECT
             u.ID AS icResiUserId,
+            u.grid_id as gridId,
+            u.VILLAGE_ID as villageId,
+            u.BUILD_ID as buildId,
+            u.UNIT_ID as unitId,
+            u.HOME_ID as homeId,
             u.`NAME` AS `name`,
             u.MOBILE AS mobile,
             u.ID_CARD AS idCard,
@@ -1601,8 +1606,7 @@
             u.CULTURE AS educationCode,
             '' AS educationName,
             IFNULL(u.CULTURE,'')AS educationCode,
-            u.BIRTHDAY AS birthday,
-            u.grid_id as gridId
+            u.BIRTHDAY AS birthday
         FROM
             ic_resi_user u
         WHERE