Merge remote-tracking branch 'origin/dev_0617'

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java

@@ -24,6 +24,10 @@ public class CollectListFormDTO extends PageFormDTO {
      */
     private String startDate;
     private String endDate;
+    /**
+     * 户籍所在地
+     */
+    private String domicilePlace;
 
     private String userId;
     private String customerId;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java

@@ -49,11 +49,26 @@ public class IcResiCollectMemFormDTO implements Serializable {
      */
     private String domicilePlace;
 
+    /**
+     * 户籍所在地行政地区编码
+     */
+    private String domicilePlaceCode;
+
+    /**
+     * 户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203
+     */
+    private String domicilePlaceCodePath;
+
     /**
      * 学校或公司
      */
     private String workPlace;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 社区居民信息登记-查询返参用
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java

@@ -86,9 +86,9 @@ public class ResiCollectFormDTO implements Serializable {
     private String address;
 
     /**
-     * 1自有0租住
+     * 房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住  2：闲置 3：未售出
      */
-    @NotBlank(message = "房子属于自有还是租住？", groups = {InternalShowGroup.class})
+    @NotBlank(message = "房子状态不能为空", groups = {InternalShowGroup.class})
     private String houseType;
 
     /**

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

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -38,6 +39,8 @@ public class CollectListResultDTO implements Serializable {
      */
     private Integer totalResi;
 
+    private String domicilePlace;
+
     private List<CollectListMemberResultDTO> list;
 
 
@@ -73,10 +76,24 @@ public class CollectListResultDTO implements Serializable {
          */
         private String domicilePlace;
 
+        /**
+         * 户籍所在地行政地区编码
+         */
+        private String domicilePlaceCode;
+
+        /**
+         * 户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203
+         */
+        private String domicilePlaceCodePath;
+
         /**
          * 学校或公司
          */
         private String workPlace;
 
+        /**
+         * 备注
+         */
+        private String remark;
     }
 }

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

@@ -34,6 +34,8 @@ public interface IcResiCollectDao extends BaseDao<IcResiCollectEntity> {
      */
     List<CollectListResultDTO> getCollectList(CollectListFormDTO formDTO);
 
+    List<CollectListResultDTO.CollectListMemberResultDTO> selectMemberList(@Param("id") String id, @Param("domicilePlace") String domicilePlace);
+
     /**
      * 我上次提交的主表记录
      * @param customerId

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java

@@ -69,7 +69,7 @@ public class IcResiCollectEntity extends BaseEpmetEntity {
 	private String address;
 
     /**
-     * 1自由0租住
+     * 房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住  2：闲置 3：未售出
      */
 	private String houseType;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java

@@ -58,8 +58,23 @@ public class IcResiMemberEntity extends BaseEpmetEntity {
 	 */
 	private String domicilePlace;
 
+	/**
+	 * 户籍所在地行政地区编码
+	 */
+	private String domicilePlaceCode;
+
+	/**
+	 * 户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203
+	 */
+	private String domicilePlaceCodePath;
+
 	/**
 	 * 学校或公司
 	 */
 	private String workPlace;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
 }

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.53__ic_resimember_huji.sql

@@ -0,0 +1,2 @@
+alter table ic_resi_member add COLUMN DOMICILE_PLACE_CODE  VARCHAR(64) DEFAULT '' comment '户籍所在地行政地区编码' AFTER DOMICILE_PLACE;
+alter table ic_resi_member add COLUMN DOMICILE_PLACE_CODE_PATH  VARCHAR(255) DEFAULT '' comment '户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203' AFTER DOMICILE_PLACE_CODE;

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.54__ic_resicollect_reamrk.sql

@@ -0,0 +1,2 @@
+alter table ic_resi_collect MODIFY COLUMN `HOUSE_TYPE` varchar(1) NOT NULL COMMENT '房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住  2：闲置 3：未售出';
+alter table ic_resi_member add COLUMN REMARK VARCHAR(512) DEFAULT '' COMMENT '备注' AFTER WORK_PLACE;

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

@@ -16,16 +16,19 @@
         <result property="address" column="address"/>
         <result property="houseType" column="houseType"/>
         <result property="totalResi" column="totalResi"/>
-        <collection property="list" ofType="com.epmet.dto.result.CollectListResultDTO$CollectListMemberResultDTO" column="id" select="selectMemberList"/>
+        <result property="domicilePlace" column="domicilePlace"></result>
+        <collection property="list" ofType="com.epmet.dto.result.CollectListResultDTO$CollectListMemberResultDTO" column="{id=id,domicilePlace=domicile_place}" select="selectMemberList"/>
     </resultMap>
     <select id="getCollectList" resultMap="getCollectListMap">
         SELECT
-            c.id as id,
+            distinct c.id as id,
             c.HOUSE_HOLDER_NAME AS houseHolderName,
             c.ADDRESS AS address,
             c.HOUSE_TYPE AS houseType,
-            c.TOTAL_RESI AS totalResi
+            c.TOTAL_RESI AS totalResi,
+            #{domicilePlace} as domicile_place
         FROM ic_resi_collect c
+        left join ic_resi_member m on(c.id=m.IC_RESI_COLLECT_ID and m.del_flag='0')
         WHERE c.DEL_FLAG = 0
         <if test='orgId != null and orgId != "" '>
             AND CONCAT(c.PIDS,':',c.AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
@@ -42,9 +45,12 @@
         <if test='id != null and id != "" '>
             AND c.id=#{id}
         </if>
+        <if test='domicilePlace != null and domicilePlace != "" '>
+            AND m.DOMICILE_PLACE LIKE CONCAT('%',#{domicilePlace},'%')
+        </if>
         ORDER BY c.CREATED_TIME DESC
     </select>
-    <select id="selectMemberList" resultType="com.epmet.dto.result.CollectListResultDTO$CollectListMemberResultDTO">
+    <select id="selectMemberList" parameterType="map" resultType="com.epmet.dto.result.CollectListResultDTO$CollectListMemberResultDTO">
         select
             m.`NAME` AS memberName,
             m.ID_NUM AS memberIdNum,
@@ -52,10 +58,16 @@
             m.HE_SUAN_COUNT AS heSuanCount,
             m.YMJZ AS ymjz,
             m.DOMICILE_PLACE as domicilePlace,
-            m.WORK_PLACE as workPlace
+            m.DOMICILE_PLACE_CODE as domicilePlaceCode,
+            m.DOMICILE_PLACE_CODE_PATH as domicilePlaceCodePath,
+            m.WORK_PLACE as workPlace,
+            m.REMARK as remark
         from ic_resi_member m
         where m.DEL_FLAG = 0
         and m.IC_RESI_COLLECT_ID = #{id}
+        <if test='domicilePlace != null and domicilePlace != "" '>
+            AND m.DOMICILE_PLACE LIKE CONCAT('%',#{domicilePlace},'%')
+        </if>
     </select>
 
     <update id="updateRec" parameterType="map">

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

@@ -14,7 +14,10 @@
             m.HE_SUAN_COUNT,
             m.YMJZ,
             m.DOMICILE_PLACE,
-            m.WORK_PLACE
+            m.WORK_PLACE,
+            m.DOMICILE_PLACE_CODE,
+            m.DOMICILE_PLACE_CODE_PATH,
+            m.REMARK
         FROM
             ic_resi_member m
         WHERE