补充人员更新操作

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java

@@ -1,7 +1,5 @@
 package com.elink.esua.epdc.vaccine.epidemic.dto;
 
-// import io.swagger.annotations.ApiModel;
-// import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.*;
@@ -42,9 +40,9 @@ public class EpidemicReportUserInfoDTO implements Serializable {
     // @ApiModelProperty(value = "联系方式")
     @NotNull(message = "手机号不能为空")
     @NotBlank(message = "手机号不能为空")
-	@Pattern(regexp ="^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误")
+    @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误")
-	@Max(value = 11,message = "手机号只能为{max}位")
+    @Max(value = 11, message = "手机号只能为{max}位")
-	@Min(value = 11,message = "手机号只能为{min}位")
+    @Min(value = 11, message = "手机号只能为{min}位")
     private String mobile;
 
     // @ApiModelProperty(value = "户籍地code")
@@ -54,7 +52,7 @@ public class EpidemicReportUserInfoDTO implements Serializable {
     private String householdRegisterName;
 
     // @ApiModelProperty(value = "户籍地详细地址")
-	@Size( min = 2,max = 200)
+    @Size(min = 2, max = 200)
     private String householdRegisterDetail;
 
     // @ApiModelProperty(value = "居住地code")
@@ -64,16 +62,16 @@ public class EpidemicReportUserInfoDTO implements Serializable {
     private String liveAddressName;
 
     // @ApiModelProperty(value = "居住地详细地址")
-	@Size( min = 2,max = 200)
+    @Size(min = 2, max = 200)
     private String liveAddressDetail;
 
     // @ApiModelProperty(value = "居住地关联人")
     private String relationPeople;
 
     // @ApiModelProperty(value = "居住地关联人联系电话")
-	@Pattern(regexp ="^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "关联人联系电话号格式有误")
+    @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "关联人联系电话号格式有误")
-	@Max(value = 11,message = "手机号只能为{max}位")
+    @Max(value = 11, message = "手机号只能为{max}位")
-	@Min(value = 11,message = "手机号只能为{min}位")
+    @Min(value = 11, message = "手机号只能为{min}位")
     private String relationPeopleMobile;
 
     // @ApiModelProperty(value = "与本人关系")
@@ -86,7 +84,7 @@ public class EpidemicReportUserInfoDTO implements Serializable {
     private String outWorkplaceName;
 
     // @ApiModelProperty(value = "在外工作地详细地址")
-	@Size( min = 2,max = 200)
+    @Size(min = 2, max = 200)
     private String outWorkplaceDetail;
 
     // @ApiModelProperty(value = "在外居住在code")
@@ -96,11 +94,11 @@ public class EpidemicReportUserInfoDTO implements Serializable {
     private String outLiveAddressName;
 
     // @ApiModelProperty(value = "在外居住在详细地址")
-	@Size( min = 2,max = 200)
+    @Size(min = 2, max = 200)
     private String outLiveAddressDetail;
 
     // @ApiModelProperty(value = "往返情况（1：在平阴；2：在外地）")
-	@Size( min = 1)
+    @Size(min = 1)
     private String returnState;
 
     // @ApiModelProperty(value = "乐观锁")
@@ -137,7 +135,7 @@ public class EpidemicReportUserInfoDTO implements Serializable {
     // @ApiModelProperty(value = "返回目的地地址(省，市，县，街道)地址")
     private String goBarkDestinationName;
     // @ApiModelProperty(value = "返回目的地详细地址")
-	@Size( min = 2,max = 200)
+    @Size(min = 2, max = 200)
     private String goBarkDestination;
 
     // @ApiModelProperty(value = "离开平阴时间")
@@ -146,7 +144,7 @@ public class EpidemicReportUserInfoDTO implements Serializable {
     private String destinationAddressCode;
     // @ApiModelProperty(value = "去往目的地地址(省，市，县，街道)地址")
     private String destinationAddressName;
-	@Size( min = 2,max = 200)
+    @Size(min = 2, max = 200)
     // @ApiModelProperty(value = "去往目的地详细地址")
     private String destinationAddressDetail;
     // @ApiModelProperty(value = "去过疫情重点地区")
@@ -277,6 +275,7 @@ public class EpidemicReportUserInfoDTO implements Serializable {
 
     // @ApiModelProperty(value = "居住情况")
     private String livingSituation;
+
     // @ApiModelProperty(value = "户籍地所在省份")
     private String householdRegisterProvince;
 

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/entity/EpidemicUserInfoEntity.java

@@ -300,4 +300,6 @@ public class EpidemicUserInfoEntity extends BasePingyinEntity {
 	 * 在外月数
 	 */
 	private Integer familyMemberOutMonth;
+
+	private String houseProperty;
 }

epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml

@@ -132,6 +132,7 @@
                ui.HOUSEHOLD_REGISTER_DETAIL,
                ui.ID,
                ui.MOBILE,
+               ui.HOUSE_PROPERTY,
                ui.GENDER,
                ui.NATION,
                ui.FORMER_NAME,