补充人员更新操作

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.*;
@@ -20,277 +18,278 @@ import java.util.Date;
 public class EpidemicReportUserInfoDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	// @ApiModelProperty(value = "主键")
+    // @ApiModelProperty(value = "主键")
-	private Long id;
+    private Long id;
 
-	// @ApiModelProperty(value = "人员出入信息表id")
+    // @ApiModelProperty(value = "人员出入信息表id")
-	private Long userInoutId;
+    private Long userInoutId;
 
-	// @ApiModelProperty(value = "人员姓名")
+    // @ApiModelProperty(value = "人员姓名")
-	@Size(min = 2, max = 25)
+    @Size(min = 2, max = 25)
-	private String userName;
+    private String userName;
 
-	// @ApiModelProperty(value = "性别 (1:男；2：女)")
+    // @ApiModelProperty(value = "性别 (1:男；2：女)")
-	private String sex;
+    private String sex;
 
-	// @ApiModelProperty(value = "出生年月")
+    // @ApiModelProperty(value = "出生年月")
-	private String birthday;
+    private String birthday;
 
-	// @ApiModelProperty(value = "身份证号")
+    // @ApiModelProperty(value = "身份证号")
-	private String idCard;
+    private String idCard;
 
-	// @ApiModelProperty(value = "联系方式")
+    // @ApiModelProperty(value = "联系方式")
-	@NotNull(message = "手机号不能为空")
+    @NotNull(message = "手机号不能为空")
-	@NotBlank(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;
+    private String mobile;
 
-	// @ApiModelProperty(value = "户籍地code")
+    // @ApiModelProperty(value = "户籍地code")
-	private String householdRegisterCode;
+    private String householdRegisterCode;
 
-	// @ApiModelProperty(value = "户籍地名称")
+    // @ApiModelProperty(value = "户籍地名称")
-	private String householdRegisterName;
+    private String householdRegisterName;
 
-	// @ApiModelProperty(value = "户籍地详细地址")
+    // @ApiModelProperty(value = "户籍地详细地址")
-	@Size( min = 2,max = 200)
+    @Size(min = 2, max = 200)
-	private String householdRegisterDetail;
+    private String householdRegisterDetail;
 
-	// @ApiModelProperty(value = "居住地code")
+    // @ApiModelProperty(value = "居住地code")
-	private String liveAddressCode;
+    private String liveAddressCode;
 
-	// @ApiModelProperty(value = "居住地名称")
+    // @ApiModelProperty(value = "居住地名称")
-	private String liveAddressName;
+    private String liveAddressName;
 
-	// @ApiModelProperty(value = "居住地详细地址")
+    // @ApiModelProperty(value = "居住地详细地址")
-	@Size( min = 2,max = 200)
+    @Size(min = 2, max = 200)
-	private String liveAddressDetail;
+    private String liveAddressDetail;
 
-	// @ApiModelProperty(value = "居住地关联人")
+    // @ApiModelProperty(value = "居住地关联人")
-	private String relationPeople;
+    private String relationPeople;
 
-	// @ApiModelProperty(value = "居住地关联人联系电话")
+    // @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;
+    private String relationPeopleMobile;
 
-	// @ApiModelProperty(value = "与本人关系")
+    // @ApiModelProperty(value = "与本人关系")
-	private String relationShip;
+    private String relationShip;
 
-	// @ApiModelProperty(value = "在外工作地code")
+    // @ApiModelProperty(value = "在外工作地code")
-	private String outWorkplaceCode;
+    private String outWorkplaceCode;
 
-	// @ApiModelProperty(value = "在外工作地名称")
+    // @ApiModelProperty(value = "在外工作地名称")
-	private String outWorkplaceName;
+    private String outWorkplaceName;
 
-	// @ApiModelProperty(value = "在外工作地详细地址")
+    // @ApiModelProperty(value = "在外工作地详细地址")
-	@Size( min = 2,max = 200)
+    @Size(min = 2, max = 200)
-	private String outWorkplaceDetail;
+    private String outWorkplaceDetail;
 
-	// @ApiModelProperty(value = "在外居住在code")
+    // @ApiModelProperty(value = "在外居住在code")
-	private String outLiveAddressCode;
+    private String outLiveAddressCode;
 
-	// @ApiModelProperty(value = "在外居住在名称")
+    // @ApiModelProperty(value = "在外居住在名称")
-	private String outLiveAddressName;
+    private String outLiveAddressName;
 
-	// @ApiModelProperty(value = "在外居住在详细地址")
+    // @ApiModelProperty(value = "在外居住在详细地址")
-	@Size( min = 2,max = 200)
+    @Size(min = 2, max = 200)
-	private String outLiveAddressDetail;
+    private String outLiveAddressDetail;
 
-	// @ApiModelProperty(value = "往返情况（1：在平阴；2：在外地）")
+    // @ApiModelProperty(value = "往返情况（1：在平阴；2：在外地）")
-	@Size( min = 1)
+    @Size(min = 1)
-	private String returnState;
+    private String returnState;
 
-	// @ApiModelProperty(value = "乐观锁")
+    // @ApiModelProperty(value = "乐观锁")
-	private Integer revision;
+    private Integer revision;
 
-	// @ApiModelProperty(value = "创建人")
+    // @ApiModelProperty(value = "创建人")
-	private String createdBy;
+    private String createdBy;
 
-	// @ApiModelProperty(value = "创建时间")
+    // @ApiModelProperty(value = "创建时间")
-	private Date createdTime;
+    private Date createdTime;
 
-	// @ApiModelProperty(value = "更新人")
+    // @ApiModelProperty(value = "更新人")
-	private String updatedBy;
+    private String updatedBy;
 
-	// @ApiModelProperty(value = "更新时间")
+    // @ApiModelProperty(value = "更新时间")
-	private Date updatedTime;
+    private Date updatedTime;
 
-	// @ApiModelProperty(value = "逻辑删除标识")
+    // @ApiModelProperty(value = "逻辑删除标识")
-	private String delFlag;
+    private String delFlag;
 
-	// @ApiModelProperty(value = "工作单位")
+    // @ApiModelProperty(value = "工作单位")
-	private String workUnit;
+    private String workUnit;
 
-	// @ApiModelProperty(value = "职务")
+    // @ApiModelProperty(value = "职务")
-	private String duty;
+    private String duty;
 
-	// @ApiModelProperty(value = "风险等级 (1:低风险，2：中风险，3：高风险)")
+    // @ApiModelProperty(value = "风险等级 (1:低风险，2：中风险，3：高风险)")
-	private String riskGrade;
+    private String riskGrade;
 
-	// @ApiModelProperty(value = "返回平阴时间")
+    // @ApiModelProperty(value = "返回平阴时间")
-	private String goBarkTime;
+    private String goBarkTime;
-	// @ApiModelProperty(value = "返回目的地code")
+    // @ApiModelProperty(value = "返回目的地code")
-    private String 	goBarkDestinationCode;
+    private String goBarkDestinationCode;
-	// @ApiModelProperty(value = "返回目的地地址(省，市，县，街道)地址")
+    // @ApiModelProperty(value = "返回目的地地址(省，市，县，街道)地址")
-	private String 	goBarkDestinationName;
+    private String goBarkDestinationName;
-	// @ApiModelProperty(value = "返回目的地详细地址")
+    // @ApiModelProperty(value = "返回目的地详细地址")
-	@Size( min = 2,max = 200)
+    @Size(min = 2, max = 200)
-	private String goBarkDestination;
+    private String goBarkDestination;
 
-	// @ApiModelProperty(value = "离开平阴时间")
+    // @ApiModelProperty(value = "离开平阴时间")
-	private String leaveTime;
+    private String leaveTime;
-	// @ApiModelProperty(value = "去往目的地Code")
+    // @ApiModelProperty(value = "去往目的地Code")
-	private String destinationAddressCode;
+    private String destinationAddressCode;
-	// @ApiModelProperty(value = "去往目的地地址(省，市，县，街道)地址")
+    // @ApiModelProperty(value = "去往目的地地址(省，市，县，街道)地址")
-	private String destinationAddressName;
+    private String destinationAddressName;
-	@Size( min = 2,max = 200)
+    @Size(min = 2, max = 200)
-	// @ApiModelProperty(value = "去往目的地详细地址")
+    // @ApiModelProperty(value = "去往目的地详细地址")
-	private String destinationAddressDetail;
+    private String destinationAddressDetail;
-	// @ApiModelProperty(value = "去过疫情重点地区")
+    // @ApiModelProperty(value = "去过疫情重点地区")
-	private String emphasisRegion;
+    private String emphasisRegion;
 
-	// @ApiModelProperty(value = "性别")
+    // @ApiModelProperty(value = "性别")
-	private String gender;
+    private String gender;
 
-	// @ApiModelProperty(value = "民族")
+    // @ApiModelProperty(value = "民族")
-	private String nation;
+    private String nation;
 
-	// @ApiModelProperty(value = "曾用名")
+    // @ApiModelProperty(value = "曾用名")
-	private String formerName;
+    private String formerName;
 
 
-	// @ApiModelProperty(value = "身高")
+    // @ApiModelProperty(value = "身高")
-	private String height;
+    private String height;
 
-	// @ApiModelProperty(value = "文化程度")
+    // @ApiModelProperty(value = "文化程度")
-	private String standardOfCulture;
+    private String standardOfCulture;
 
-	// @ApiModelProperty(value = "健康情况")
+    // @ApiModelProperty(value = "健康情况")
-	private String health;
+    private String health;
 
-	// @ApiModelProperty(value = "婚姻状况")
+    // @ApiModelProperty(value = "婚姻状况")
-	private String maritalStatus;
+    private String maritalStatus;
 
-	// @ApiModelProperty(value = "与户主关系")
+    // @ApiModelProperty(value = "与户主关系")
-	private String relation;
+    private String relation;
 
-	// @ApiModelProperty(value = "国籍")
+    // @ApiModelProperty(value = "国籍")
-	private String nationality;
+    private String nationality;
 
-	// @ApiModelProperty(value = "政治面貌")
+    // @ApiModelProperty(value = "政治面貌")
-	private String politicsStatus;
+    private String politicsStatus;
 
-	// @ApiModelProperty(value = "宗教信仰")
+    // @ApiModelProperty(value = "宗教信仰")
-	private String faith;
+    private String faith;
 
-	// @ApiModelProperty(value = "毕业院校")
+    // @ApiModelProperty(value = "毕业院校")
-	private String graduateSchool;
+    private String graduateSchool;
 
-	// @ApiModelProperty(value = "专业")
+    // @ApiModelProperty(value = "专业")
-	private String professional;
+    private String professional;
 
-	// @ApiModelProperty(value = "工作状态")
+    // @ApiModelProperty(value = "工作状态")
-	private String workStatus;
+    private String workStatus;
 
-	// @ApiModelProperty(value = "血型")
+    // @ApiModelProperty(value = "血型")
-	private String bloodType;
+    private String bloodType;
-	// @ApiModelProperty(value = "行业类别")
+    // @ApiModelProperty(value = "行业类别")
-	private String industryCategory;
+    private String industryCategory;
 
-	// @ApiModelProperty(value = "工作单位（现/原）")
+    // @ApiModelProperty(value = "工作单位（现/原）")
-	private String workUnits;
+    private String workUnits;
 
-	// @ApiModelProperty(value = "兵役状况")
+    // @ApiModelProperty(value = "兵役状况")
-	private String military;
+    private String military;
 
-	// @ApiModelProperty(value = "人口类别")
+    // @ApiModelProperty(value = "人口类别")
-	private String peopleCategories;
+    private String peopleCategories;
 
-	// @ApiModelProperty(value = "特殊人群")
+    // @ApiModelProperty(value = "特殊人群")
-	private String specialCrowd;
+    private String specialCrowd;
 
-	// @ApiModelProperty(value = "有无车辆")
+    // @ApiModelProperty(value = "有无车辆")
-	private String car;
+    private String car;
 
-	// @ApiModelProperty(value = "车牌号")
+    // @ApiModelProperty(value = "车牌号")
-	private String carNo;
+    private String carNo;
 
-	// @ApiModelProperty(value = "人户状况")
+    // @ApiModelProperty(value = "人户状况")
-	private String hushaiStatus;
+    private String hushaiStatus;
 
-	// @ApiModelProperty(value = "籍贯")
+    // @ApiModelProperty(value = "籍贯")
-	private String nativePlace;
+    private String nativePlace;
 
 
-	// @ApiModelProperty(value = "县内居住镇街")
+    // @ApiModelProperty(value = "县内居住镇街")
-	private String liveAddressStreet;
+    private String liveAddressStreet;
 
 
-	// @ApiModelProperty(value = "现居住地省份")
+    // @ApiModelProperty(value = "现居住地省份")
-	private String outLiveAddressProvince;
+    private String outLiveAddressProvince;
 
-	// @ApiModelProperty(value = "现居住地市州")
+    // @ApiModelProperty(value = "现居住地市州")
-	private String outLiveAddressCity;
+    private String outLiveAddressCity;
 
-	// @ApiModelProperty(value = "现居住地区县")
+    // @ApiModelProperty(value = "现居住地区县")
-	private String outLiveAddressArea;
+    private String outLiveAddressArea;
 
-	// @ApiModelProperty(value = "拟去往目的地省份")
+    // @ApiModelProperty(value = "拟去往目的地省份")
-	private String destinationAddressProvince;
+    private String destinationAddressProvince;
 
-	// @ApiModelProperty(value = "拟去往目的地市州")
+    // @ApiModelProperty(value = "拟去往目的地市州")
-	private String destinationAddressCity;
+    private String destinationAddressCity;
 
-	// @ApiModelProperty(value = "拟去往目的地区县")
+    // @ApiModelProperty(value = "拟去往目的地区县")
-	private String destinationAddressArea;
+    private String destinationAddressArea;
 
-	// @ApiModelProperty(value = "拟去往目的地镇街")
+    // @ApiModelProperty(value = "拟去往目的地镇街")
-	private String destinationAddressStreet;
+    private String destinationAddressStreet;
 
 
-	// @ApiModelProperty(value = "社区/村庄")
+    // @ApiModelProperty(value = "社区/村庄")
-	private String community;
+    private String community;
 
-	// @ApiModelProperty(value = "网格名称")
+    // @ApiModelProperty(value = "网格名称")
-	private String gridName;
+    private String gridName;
 
-	// @ApiModelProperty(value = "小区")
+    // @ApiModelProperty(value = "小区")
-	private String plot;
+    private String plot;
 
-	// @ApiModelProperty(value = "楼号")
+    // @ApiModelProperty(value = "楼号")
-	private String buildingNo;
+    private String buildingNo;
 
-	// @ApiModelProperty(value = "单元")
+    // @ApiModelProperty(value = "单元")
-	private String unit;
+    private String unit;
 
-	// @ApiModelProperty(value = "房间号")
+    // @ApiModelProperty(value = "房间号")
-	private String roomNo;
+    private String roomNo;
 
-	// @ApiModelProperty(value = "房屋性质")
+    // @ApiModelProperty(value = "房屋性质")
-	private String houseProperty;
+    private String houseProperty;
 
-	// @ApiModelProperty(value = "家庭保障情况")
+    // @ApiModelProperty(value = "家庭保障情况")
-	private String familySecurity;
+    private String familySecurity;
 
-	// @ApiModelProperty(value = "居住情况")
+    // @ApiModelProperty(value = "居住情况")
-	private String livingSituation;
+    private String livingSituation;
-	// @ApiModelProperty(value = "户籍地所在省份")
-	private String householdRegisterProvince;
 
-	// @ApiModelProperty(value = "户籍地所在市州")
+    // @ApiModelProperty(value = "户籍地所在省份")
-	private String householdRegisterCity;
+    private String householdRegisterProvince;
 
-	// @ApiModelProperty(value = "户籍地所在区县")
+    // @ApiModelProperty(value = "户籍地所在市州")
-	private String householdRegisterArea;
+    private String householdRegisterCity;
 
-	// @ApiModelProperty(value = "户籍地所在镇街")
+    // @ApiModelProperty(value = "户籍地所在区县")
-	private String householdRegisterStreet;
+    private String householdRegisterArea;
 
-	// @ApiModelProperty(value = "接种状态")
+    // @ApiModelProperty(value = "户籍地所在镇街")
-	private Integer vaccinationState;
+    private String householdRegisterStreet;
+
+    // @ApiModelProperty(value = "接种状态")
+    private Integer vaccinationState;
 
 
 }

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,