From aef219e6e7e9fb1f3592806d5e64ce714adf6848 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期五, 18 六月 2021 15:39:51 +0800
Subject: [PATCH] bug-424-【后端-宣传教育-新增 】 宣传人数只能输入大于等于0的正正数，8位长度字符
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 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 4670491..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,11 +1,13 @@
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;
@@ -73,7 +75,7 @@
@ApiModelProperty("门牌号")
@NotBlank(groups = {AddGroup.class},message = "门牌号不可为空")
- private Integer doorNo;
+ private String doorNo;
@ApiModelProperty("楼排号")
@NotBlank(groups = {AddGroup.class},message = "楼排号不可为空")
@@ -81,11 +83,11 @@
@ApiModelProperty("单元号")
@NotBlank(groups = {AddGroup.class},message = "单元号不可为空")
- private Integer unitNo;
+ private String unitNo;
@ApiModelProperty("户室（房间号）")
@NotBlank(groups = {AddGroup.class},message = "户室（房间号）不可为空")
- private Integer houseNo;
+ private String houseNo;
@ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
@NotBlank(groups = {AddGroup.class},message = "政治面貌不可为空")
@@ -110,9 +112,11 @@
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("籍贯")
@@ -124,7 +128,7 @@
@ApiModelProperty("小区名字")
private String alley;
- @ApiModelProperty("户主关系")
+ @ApiModelProperty("户主关系列表")
private List<ComHouseMemberVo> comMngFamilyInfoVOS;
@ApiModelProperty("家庭成员信息")
@@ -137,11 +141,11 @@
@NotBlank(groups = {AddGroup.class},message = "是否租住不可为空")
private Integer isRent;
- @ApiModelProperty("文化程度")
- private String cultureLevel;
+ @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
+ private Integer cultureLevel;
- @ApiModelProperty("婚姻状况")
- private String marriage;
+ @ApiModelProperty("婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)")
+ private Integer marriage;
@ApiModelProperty("健康状况")
private String healthy;
@@ -152,6 +156,15 @@
@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