From 3d2dccde51582e3a58d2afe4731ec1ad04229ee4 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 30 八月 2021 09:25:46 +0800
Subject: [PATCH] 预约登记功能修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java | 68 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 5 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 1121fdf..bfde4ee 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,8 @@
package com.panzhihua.common.model.vos.community;
+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;
@@ -29,6 +32,7 @@
* 自增 id
*/
@ApiModelProperty("实有人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 街道id
@@ -44,7 +48,8 @@
* 小区id（实有房屋id）
*/
@ApiModelProperty("小区id（实有房屋id）")
- private Integer villageId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private long villageId;
/**
* 家庭成员（姓名）
*/
@@ -74,7 +79,7 @@
@ApiModelProperty("门牌号")
@NotBlank(groups = {AddGroup.class},message = "门牌号不可为空")
- private Integer doorNo;
+ private String doorNo;
@ApiModelProperty("楼排号")
@NotBlank(groups = {AddGroup.class},message = "楼排号不可为空")
@@ -82,15 +87,18 @@
@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 = "政治面貌不可为空")
private Integer politicalOutlook;
+
+ @ApiModelProperty("政治面貌名称")
+ private String politicalOutlookName;
@ApiModelProperty("工作单位")
private String workCompany;
@@ -111,13 +119,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;
@@ -141,8 +154,17 @@
@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 +175,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,6 +193,33 @@
@ApiModelProperty("车辆列表")
private List<ComMngPopulationCarVO> carList;
+ @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;
+
public interface sex{
int nan = 1;
int nv = 2;
--
Gitblit v1.7.1