Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java

@@ -17,6 +17,54 @@ public class ResiPortrayalDetailDTO {
      */
     @ExcelIgnore
     private String icResiUserId;
+
+    @ExcelIgnore
+    private String gridId;
+
+    @ExcelProperty(value = "所属网格")
+    @ColumnWidth(30)
+    private String gridName;
+
+    /**
+     * 所属小区ID
+     */
+    @ExcelIgnore
+    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;
+
+
     /**
      * 姓名
      */
@@ -38,7 +86,7 @@ public class ResiPortrayalDetailDTO {
      * 性别名称
      */
     @ExcelProperty(value = "性别")
-    @ColumnWidth(25)
+    @ColumnWidth(10)
     private String genderName;
     /**
      * 身份证
@@ -66,9 +114,8 @@ public class ResiPortrayalDetailDTO {
      * 学历
      */
     @ExcelProperty(value = "学历")
-    @ColumnWidth(25)
+    @ColumnWidth(10)
     private String educationName;
 
-
 }
 

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

@@ -4039,10 +4039,37 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
         PageHelper.startPage(pageNo, pageSize);
         List<ResiPortrayalDetailDTO> list = baseDao.selectPortrayalResiList(customerId, orgId, orgType,codeType, code);
+        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);
     }

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,