居民信息采集补充字段

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

@@ -73,4 +73,19 @@ public class IcResiCollectMemFormDTO implements Serializable {
      * 社区居民信息登记-查询返参用
      */
     private String id;
+
+    /**
+     * 与房主关系
+     */
+    private String relationship;
+
+    /**
+     * 人脸头像
+     */
+    private String faceImg;
+
+    /**
+     * 是否是党员
+     */
+    private String isParty;
 }

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

@@ -0,0 +1,101 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 收集居民信息入参
+ */
+@Data
+public class SaveCollectFormDTO implements Serializable {
+
+    /**
+     * 客户Id customer.id
+     */
+    private String customerId;
+
+    /**
+     * 内部：internal；外部：external
+     */
+    private String origin;
+
+    /**
+     * 网格ID_后端接口赋值
+     */
+    private String gridId;
+
+    /**
+     * 组织Id_后端接口赋值
+     */
+    private String agencyId;
+
+    /**
+     * 组织的pid_后端接口赋值
+     */
+    private String pids;
+
+    /**
+     * 所属小区ID
+     */
+    @NotBlank(message = "小区不能为空")
+    private String villageId;
+    @NotBlank(message = "小区名不能为空")
+    private String villageName;
+
+    /**
+     * 所属楼宇Id
+     */
+    @NotBlank(message = "楼栋不能为空")
+    private String buildId;
+    @NotBlank(message = "楼栋名不能为空")
+    private String buildName;
+
+    /**
+     * 单元id
+     */
+    @NotBlank(message = "单元不能为空")
+    private String unitId;
+    @NotBlank(message = "单元名不能为空")
+    private String unitName;
+
+    /**
+     * 所属家庭Id
+     */
+    private String homeId;
+    @NotBlank(message = "家庭名不能为空")
+    private String homeName;
+
+    /**
+     * 详细地址
+     */
+    @NotBlank(message = "家庭地址不能为空")
+    private String address;
+
+    /**
+     * 1自有0租住
+     */
+    @NotBlank(message = "房子属于自有还是租住？")
+    private String houseType;
+
+    /**
+     * 户主姓名
+     */
+    @NotBlank(message = "户主姓名不能为空")
+    private String houseHolderName;
+
+    /**
+     * 居住成员人数
+     */
+    @NotNull(message = "居住成员人数不能为空")
+    private Integer totalResi;
+
+    @Valid
+    @NotEmpty(message = "成员信息不能为空")
+    private List<IcResiCollectMemFormDTO> memberList;
+}

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

@@ -86,4 +86,14 @@ public class IcResiCollectEntity extends BaseEpmetEntity {
 	private String buildName;
 	private String unitName;
 	private String homeName;
+
+	/**
+	 * 审核状态：0待审核 1未通过 2已通过
+	 */
+	private String checkState;
+
+	/**
+	 * 审核原因
+	 */
+	private String checkReason;
 }

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

@@ -77,4 +77,19 @@ public class IcResiMemberEntity extends BaseEpmetEntity {
 	 * 备注
 	 */
 	private String remark;
+
+	/**
+	 * 与房主关系
+	 */
+	private String relationship;
+
+	/**
+	 * 人脸头像
+	 */
+	private String faceImg;
+
+	/**
+	 * 是否是党员
+	 */
+	private String isParty;
 }