Merge remote-tracking branch 'remotes/origin/dev_house_resi_export' into dev_move_out_of

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

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

@@ -20,7 +20,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.LinkedHashMap;
 import java.util.List;
 
 
@@ -36,35 +35,35 @@ public class HouseIcResiUserResultDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-    /**
-     * 客户Id customer.id
-     */
-    private String customerId;
-
-    /**
-     *
-     */
-    private String agencyId;
-
-    /**
-     * 网格ID
-     */
-    private String gridId;
-
-    /**
-     * 所属小区ID
-     */
-    private String villageId;
-
-    /**
-     * 所属楼宇Id
-     */
-    private String buildId;
-
-    /**
-     * 单元id
-     */
-    private String unitId;
+//    /**
+//     * 客户Id customer.id
+//     */
+//    private String customerId;
+//
+//    /**
+//     *
+//     */
+//    private String agencyId;
+//
+//    /**
+//     * 网格ID
+//     */
+//    private String gridId;
+//
+//    /**
+//     * 所属小区ID
+//     */
+//    private String villageId;
+//
+//    /**
+//     * 所属楼宇Id
+//     */
+//    private String buildId;
+//
+//    /**
+//     * 单元id
+//     */
+//    private String unitId;
 
     /**
      * 所属家庭Id
@@ -76,11 +75,6 @@ public class HouseIcResiUserResultDTO implements Serializable {
      */
     private List<HouseMemberResultDTO> houseMemberList;
 
-    /**
-     * 屋内的居民
-     */
-    private LinkedHashMap<String,Object> houseMemberList2;
-
     @Data
     public static class HouseMemberResultDTO implements Serializable {
 

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -746,6 +746,6 @@ public interface EpmetUserOpenFeignClient {
      * @param formDTO
      * @return
      */
-    @PostMapping("/epmetuser/icresiuser/getHouseMemberList")
+    @PostMapping("/epmetuser/icresiuser/getResiUserGroupHomeId")
     Result<List<HouseIcResiUserResultDTO>> getHouseMemberList(@RequestBody RentTenantDataFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -1001,6 +1001,9 @@ public class IcResiUserController implements ResultDataResolver {
         List<HomeUserBriefResultDTO> r = icResiUserService.listHomeUserBrief(houseId, customerId);
         return new Result().ok(r);
     }
+    @PostMapping("getResiUserGroupHomeId")
+    Result<List<HouseIcResiUserResultDTO>> getResiUserGroupHomeId(@RequestBody RentTenantDataFormDTO formDTO) {
+        return new Result().ok(icResiUserService.getResiUserGroupHomeId(formDTO));
 
     /**
      * 根据房屋id,查询居民信息表中-家庭信息-本人  的居民。如果有多个，返回最近一个

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -308,5 +308,5 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @param formDTO
      * @return
      */
-    List<HouseIcResiUserResultDTO> getResiUser(RentTenantDataFormDTO formDTO);
+    List<HouseIcResiUserResultDTO> getResiUserGroupHomeId(RentTenantDataFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -333,5 +333,5 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @param formDTO
      * @return
      */
-    List<HouseIcResiUserResultDTO> getHouseMemberList(RentTenantDataFormDTO formDTO);
+    List<HouseIcResiUserResultDTO> getResiUserGroupHomeId(RentTenantDataFormDTO formDTO);
 }

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

@@ -1844,12 +1844,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
 
     @Override
-    public List<HouseIcResiUserResultDTO> getHouseMemberList(RentTenantDataFormDTO formDTO) {
+    public List<HouseIcResiUserResultDTO> getResiUserGroupHomeId(RentTenantDataFormDTO formDTO) {
         //如果是组织 且非顶级组织 则利用pids 查询 本级及下级
         if (StringUtils.isNotBlank(formDTO.getAgencyId())){
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId());
             if (agencyInfo == null){
-                log.warn("getHouseMemberList agencyId:{} is not exist",formDTO.getAgencyId());
+                log.warn("getResiUserGroupHomeId agencyId:{} is not exist",formDTO.getAgencyId());
                 return null;
             }
             if (!NumConstant.ZERO_STR.equals(agencyInfo.getPid())) {
@@ -1860,10 +1860,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
         Page<HouseIcResiUserResultDTO> listPage = PageHelper
                 .startPage(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getIsPage())
-                .doSelectPage(()->baseDao.getResiUser(formDTO));
-        //Result<List<OptionResultDTO>> relationshipResult = epmetAdminOpenFeignClient.getRelationshipOption();
-        //Result<List<OptionResultDTO>> educationResult = epmetAdminOpenFeignClient.getEducationOption();
-        //Result<List<OptionResultDTO>> nationResult = epmetAdminOpenFeignClient.getNationOption();
+                .doSelectPage(()->baseDao.getResiUserGroupHomeId(formDTO));
+
         List<String> dictTypeList = Arrays.asList(DictTypeEnum.EDUCATION.getCode(), DictTypeEnum.RELATIONSHIP.getCode(), DictTypeEnum.NATION.getCode());
         Map<String,Map<String, String>> dictResult = new HashMap<>();
         dictTypeList.forEach(dict->{
@@ -1873,8 +1871,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             }
         });
 
+        //婚姻状况
         Map<String, String> hyzkMap = getOptionMap(formDTO.getCustomerId(),"HYZK");
 
+        //遍历数据 转换为中文
         listPage.getResult().forEach(e->{
             e.getHouseMemberList().parallelStream().forEach(o->{
                 if (StringUtils.isNotBlank(o.getIsParty())){

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -33,36 +33,6 @@
     </collection>
     </resultMap>
 
-    <resultMap id="homeMemberList2" type="com.epmet.dto.result.HouseIcResiUserResultDTO">
-
-    <result column="customer_id" property="customerId"/>
-    <result column="agency_id" property="agencyId"/>
-    <result column="grid_id" property="gridId"/>
-    <result column="village_id" property="villageId"/>
-    <result column="build_id" property="buildId"/>
-    <result column="unit_id" property="unitId"/>
-    <result column="home_id" property="homeId"/>
-    <collection property="houseMemberList2" ofType="java.util.LinkedHashMap">
-         <id column="id" property="id"/>
-        <result column="name" property="name"/>
-        <result column="mobile" property="mobile"/>
-        <result column="gender" property="gender"/>
-        <result column="id_card" property="idCard"/>
-        <result column="birthday" property="birthday"/>
-        <result column="hjszd" property="hjszd"/>
-        <result column="yhzgx" property="yhzgx"/>
-        <result column="is_party" property="isParty"/>
-        <result column="is_tenant" property="isTenant"/>
-        <result column="is_floating" property="isFloating"/>
-        <result column="gzdw" property="gzdw"/>
-        <result column="mz" property="mz"/>
-        <result column="jg" property="jg"/>
-        <result column="hyzk" property="hyzk"/>
-        <result column="culture" property="culture"/>
-        <result column="faith" property="faith"/>
-        <result column="remarks" property="remarks"/>
-    </collection>
-    </resultMap>
     <insert id="add">
         insert into ${tableName}
         (
@@ -971,9 +941,10 @@
         </choose>
         GROUP BY is_floating
     </select>
-    <select id="getResiUser" resultMap="homeMemberList">
+    <select id="getResiUserGroupHomeId" resultMap="homeMemberList">
         SELECT
-            *
+            HOME_ID,
+            ID,NAME,GENDER,MOBILE,ID_CARD,BIRTHDAY,HJSZD,YHZGX,IS_PARTY,IS_TENANT,IS_FLOATING,GZDW,MZ,JG,HYZK,CULTURE,FAITH,REMARKS
         FROM  ic_resi_user
         WHERE
         CUSTOMER_ID = #{customerId}