elink-star
/
epdc-cloud-custom-yushan
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

补充人员更新操作

origin/epidemic_user
zhangyuan 4 years ago
parent
61c66ef881
commit
4c74e883a4
3 changed files with 194 additions and 192 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 383
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java
  2. 2
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/entity/EpidemicUserInfoEntity.java
  3. 1
      epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml

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

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

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

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

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

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

Write Preview
Loading…
Cancel
Save