From 5fc3fd7cbad93a8bc4a0d13f8217d4e2642450df Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 06 九月 2021 11:30:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java | 110 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 88 insertions(+), 22 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 ff85fb5..48daa8c 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,5 +1,13 @@
package com.panzhihua.common.model.vos.community;
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
@@ -9,13 +17,10 @@
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;
import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
-import java.util.List;
/**
* 实有人口Vo
@@ -29,6 +34,7 @@
* 自增 id
*/
@ApiModelProperty("实有人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 街道id
@@ -44,24 +50,25 @@
* 小区id（实有房屋id）
*/
@ApiModelProperty("小区id（实有房屋id）")
- private Integer villageId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private long villageId;
/**
* 家庭成员（姓名）
*/
@ApiModelProperty("家庭成员（姓名）")
- @NotBlank(groups = {AddGroup.class},message = "家庭成员（姓名）不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "家庭成员（姓名）不可为空")
private String name;
@ApiModelProperty("性别（1.男 2.女 3.未知）")
- @NotBlank(groups = {AddGroup.class},message = "性别不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "性别不可为空")
private Integer sex;
@ApiModelProperty("年龄")
- @NotBlank(groups = {AddGroup.class},message = "年龄不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "年龄不可为空")
private Integer age;
@ApiModelProperty("身份证号码")
- @NotBlank(groups = {AddGroup.class},message = "身份证号码不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "身份证号码不可为空")
@EncryptDecryptField
private String cardNo;
@@ -69,28 +76,31 @@
private String birthday;
@ApiModelProperty("街路巷")
- @NotBlank(groups = {AddGroup.class},message = "街路巷不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "街路巷不可为空")
private String road;
@ApiModelProperty("门牌号")
- @NotBlank(groups = {AddGroup.class},message = "门牌号不可为空")
- private Integer doorNo;
+ @NotBlank(groups = {AddGroup.class}, message = "门牌号不可为空")
+ private String doorNo;
@ApiModelProperty("楼排号")
- @NotBlank(groups = {AddGroup.class},message = "楼排号不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "楼排号不可为空")
private String floor;
@ApiModelProperty("单元号")
- @NotBlank(groups = {AddGroup.class},message = "单元号不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "单元号不可为空")
private String unitNo;
@ApiModelProperty("户室（房间号）")
- @NotBlank(groups = {AddGroup.class},message = "户室（房间号）不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "户室（房间号）不可为空")
private String houseNo;
@ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
- @NotBlank(groups = {AddGroup.class},message = "政治面貌不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "政治面貌不可为空")
private Integer politicalOutlook;
+
+ @ApiModelProperty("政治面貌名称")
+ private String politicalOutlookName;
@ApiModelProperty("工作单位")
private String workCompany;
@@ -99,7 +109,7 @@
private String specialSituation;
@ApiModelProperty("联系方式")
- @NotBlank(groups = {AddGroup.class},message = "联系方式不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "联系方式不可为空")
@EncryptDecryptField
@Sensitive(strategy = SensitiveStrategy.PHONE)
private String phone;
@@ -111,13 +121,18 @@
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 nationCode;
@ApiModelProperty("民族")
private String nation;
@@ -135,14 +150,23 @@
private UserElectronicFileVO userElectronicFileVO;
@ApiModelProperty("是否租住 是否租住(0.否 1.是)")
- @NotBlank(groups = {AddGroup.class},message = "是否租住不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "是否租住不可为空")
private Integer isRent;
@ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
private Integer cultureLevel;
- @ApiModelProperty("婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)")
+ @ApiModelProperty("文化程度名称")
+ private String cultureLevelName;
+
+ @ApiModelProperty("职业")
+ private String profession;
+
+ @ApiModelProperty("婚姻状况(10.未婚 20.已婚 21.初婚 22.再婚 23.复婚 30.丧偶 40.离婚 90.未说明的婚姻状况 60.其他)")
private Integer marriage;
+
+ @ApiModelProperty("婚姻状况名称")
+ private String marriageName;
@ApiModelProperty("健康状况")
private String healthy;
@@ -153,8 +177,17 @@
@ApiModelProperty("户口所在地")
private String censusRegister;
+ /**
+ * 居住地址
+ */
+ @ApiModelProperty("居住地址")
+ private String address;
+
@ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
private Integer relation;
+
+ @ApiModelProperty("与户主关系名称")
+ private String relationName;
@ApiModelProperty("房屋列表")
private List<ComMngHouseVo> houseList;
@@ -162,7 +195,40 @@
@ApiModelProperty("车辆列表")
private List<ComMngPopulationCarVO> carList;
- public interface sex{
+ @ApiModelProperty("吸毒信息")
+ private List<ComDrugPopulationVO> comDrugPopulationVOs;
+
+ @ApiModelProperty("社区矫正信息")
+ private List<ComCorrectPopulationVO> comCorrectPopulationVOs;
+
+ @ApiModelProperty("精神障碍信息")
+ private List<ComMajorPopulationVO> comMajorPopulationVOs;
+
+ @ApiModelProperty("邪教信息")
+ private List<ComCultPopulationVO> comCultPopulationVOs;
+
+ @ApiModelProperty("刑释信息")
+ private List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOs;
+
+ @ApiModelProperty("上访信息")
+ private List<ComKeyPopulationVO> comKeyPopulationVOs;
+
+ @ApiModelProperty("退役军人信息")
+ private List<ComVeteransPopulationVO> comVeteransPopulationVOs;
+
+ @ApiModelProperty("残疾人信息")
+ private List<ComDisabilityPopulationVO> comDisabilityPopulationVOs;
+
+ @ApiModelProperty("低保户信息")
+ private List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOs;
+
+ @ApiModelProperty("高龄老人信息")
+ private List<ComElderAuthElderliesVO> comElderAuthElderliesVOList;
+
+ @ApiModelProperty("养老人员信息")
+ private List<ComPensionAuthPensionerVO> comPensionAuthPensionerVOList;
+
+ public interface sex {
int nan = 1;
int nv = 2;
int no = 3;
@@ -171,7 +237,7 @@
/**
* 是否租住
*/
- public interface isOk{
+ public interface isOk {
int yes = 1;
int no = 0;
}
@@ -179,7 +245,7 @@
/**
* 政治面貌
*/
- public interface politicalOutlook{
+ public interface politicalOutlook {
int dang = 1;
int tuan = 3;
int wu = 12;
--
Gitblit v1.7.1