From 1a054c486c9037b7cb0bca5c4472c628d1d1c36c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 28 六月 2021 16:54:06 +0800
Subject: [PATCH] 解决代码被合并后删除问题
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java | 140 ++++++++++++++++++++++------------------------
1 files changed, 66 insertions(+), 74 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
index 3d1cd24..72ee094 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
@@ -1,10 +1,14 @@
package com.panzhihua.common.model.vos.community;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.model.vos.user.ComMngHouseVo;
+import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -48,131 +52,119 @@
@ApiModelProperty("家庭成员（姓名）")
@NotBlank(groups = {AddGroup.class},message = "家庭成员（姓名）不可为空")
private String name;
- /**
- * 性别（1.男 2.女 3.未知）
- */
+
@ApiModelProperty("性别（1.男 2.女 3.未知）")
@NotBlank(groups = {AddGroup.class},message = "性别不可为空")
private Integer sex;
- /**
- * 年龄
- */
+
@ApiModelProperty("年龄")
@NotBlank(groups = {AddGroup.class},message = "年龄不可为空")
private Integer age;
- /**
- * 身份证号码
- */
+
@ApiModelProperty("身份证号码")
@NotBlank(groups = {AddGroup.class},message = "身份证号码不可为空")
@EncryptDecryptField
- @Sensitive(strategy = SensitiveStrategy.ID_CARD)
private String cardNo;
- /**
- * 街路巷
- */
+
+ @ApiModelProperty("出生年月")
+ private String birthday;
+
@ApiModelProperty("街路巷")
@NotBlank(groups = {AddGroup.class},message = "街路巷不可为空")
private String road;
- /**
- * 门牌号
- */
+
@ApiModelProperty("门牌号")
@NotBlank(groups = {AddGroup.class},message = "门牌号不可为空")
- private Integer doorNo;
- /**
- * 楼排号
- */
+ private String doorNo;
+
@ApiModelProperty("楼排号")
@NotBlank(groups = {AddGroup.class},message = "楼排号不可为空")
private String floor;
- /**
- * 单元号
- */
+
@ApiModelProperty("单元号")
@NotBlank(groups = {AddGroup.class},message = "单元号不可为空")
- private Integer unitNo;
- /**
- * 户室（房间号）
- */
+ private String unitNo;
+
@ApiModelProperty("户室（房间号）")
@NotBlank(groups = {AddGroup.class},message = "户室（房间号）不可为空")
- private Integer houseNo;
- /**
- * 政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)
- */
+ private String houseNo;
+
@ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
@NotBlank(groups = {AddGroup.class},message = "政治面貌不可为空")
private Integer politicalOutlook;
- /**
- * 工作单位
- */
+
@ApiModelProperty("工作单位")
private String workCompany;
- /**
- * 特殊情况
- */
+
+ @ApiModelProperty("特殊情况")
private String specialSituation;
- /**
- * 联系方式
- */
+
@ApiModelProperty("联系方式")
@NotBlank(groups = {AddGroup.class},message = "联系方式不可为空")
@EncryptDecryptField
@Sensitive(strategy = SensitiveStrategy.PHONE)
private String phone;
- /**
- * 备注
- */
+
@ApiModelProperty("备注")
private String remark;
- /**
- * 标签集合（多个标签以,隔开）
- */
- @ApiModelProperty("标签集合（多个标签以,隔开）")
+
+ @ApiModelProperty("标签集合（多个标签以,隔开,如物业工作人员,物业")
private String label;
- /**
- * 创建时间
- */
+
@ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
- /**
- * 修改时间
- */
+
@ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateAt;
- /**
- * 籍贯
- */
@ApiModelProperty("籍贯")
private String nativePlace;
- /**
- * 民族
- */
+
@ApiModelProperty("民族")
private String nation;
- /**
- * 小区名字
- */
+
@ApiModelProperty("小区名字")
private String alley;
- /**
- * 家庭成员
- */
- @ApiModelProperty("家庭成员")
- private List<ComMngFamilyInfoVO> comMngFamilyInfoVOS;
- /**
- * 是否租住(0.否 1.是)
- */
- @ApiModelProperty("是否租住")
+ @ApiModelProperty("户主关系列表")
+ private List<ComHouseMemberVo> comMngFamilyInfoVOS;
+
+ @ApiModelProperty("家庭成员信息")
+ private List<ComMngFamilyInfoVO> familyInfoVOList;
+
+ @ApiModelProperty("用户电子档信息")
+ private UserElectronicFileVO userElectronicFileVO;
+
+ @ApiModelProperty("是否租住 是否租住(0.否 1.是)")
@NotBlank(groups = {AddGroup.class},message = "是否租住不可为空")
private Integer isRent;
- /**
- * 性别（1.男 2.女 3.未知）
- */
+ @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
+ private Integer cultureLevel;
+
+ @ApiModelProperty("婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)")
+ private Integer marriage;
+
+ @ApiModelProperty("健康状况")
+ private String healthy;
+
+ @ApiModelProperty("外地or本地（1.本地 2.外地）")
+ private Integer outOrLocal;
+
+ @ApiModelProperty("户口所在地")
+ private String censusRegister;
+
+ @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
+ private Integer relation;
+
+ @ApiModelProperty("房屋列表")
+ private List<ComMngHouseVo> houseList;
+
+ @ApiModelProperty("车辆列表")
+ private List<ComMngPopulationCarVO> carList;
+
public interface sex{
int nan = 1;
int nv = 2;
--
Gitblit v1.7.1