From c4a8008f5d1ef301078efdb3aabc7f62c444033d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 05 八月 2021 14:21:23 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 160 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 141 insertions(+), 19 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
index 733b3bf..90c6a02 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
@@ -2,9 +2,12 @@
import com.alibaba.excel.annotation.ExcelProperty;
import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
import java.util.List;
/**
@@ -12,12 +15,14 @@
* @author: llming
*/
@Data
+@EncryptDecryptClass
public class ComMngPopulationServeExcelVO implements Serializable {
@ExcelProperty(value = "姓名", index = 0)
private String name;
@ExcelProperty(value = "身份证号码", index = 1)
+ @EncryptDecryptField
private String cardNo;
@ExcelProperty(value = "民族", index = 2)
@@ -29,57 +34,174 @@
@ExcelProperty(value = "是否租住", index = 4)
private Integer isRent;
- @ExcelProperty(value = "与户主关系", index = 5)
- private String relation;
+ @ExcelProperty(value = "与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)", index = 5)
+ private Integer relation;
+ private String relationStr;
- @ExcelProperty(value = "街路巷", index = 6)
+ @ExcelProperty(value = "街/路/巷", index = 6)
private String road;
- @ExcelProperty(value = "门牌号", index = 7)
- private Integer doorNo;
+ @ExcelProperty(value = "小区号", index = 7)
+ private String doorNo;
@ExcelProperty(value = "楼排号", index = 8)
private String floor;
@ExcelProperty(value = "单元号", index = 9)
- private Integer unitNo;
+ private String unitNo;
@ExcelProperty(value = "户室（房间号）", index = 10)
- private Integer houseNo;
+ private String houseNo;
- @ExcelProperty(value = "联系方式", index = 11)
+ @ExcelProperty(value = "建筑用途", index = 11)
+ private String buildPurpose;
+
+ @ExcelProperty(value = "建筑面积", index = 12)
+ private String buildArea;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 13)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 14)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 15)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "联系方式", index = 16)
private String phone;
- @ExcelProperty(value = "籍贯", index = 12)
+ @ExcelProperty(value = "籍贯", index = 17)
private String nativePlace;
- @ExcelProperty(value = "文化程度", index = 13)
- private String cultureLevel;
+ @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 18)
+ private Integer cultureLevel;
- @ExcelProperty(value = "婚姻状况", index = 14)
- private String marriage;
+ @ExcelProperty(value = "婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)", index = 19)
+ private Integer marriage;
- @ExcelProperty(value = "健康状况", index = 15)
+ private String marriageStr;
+
+ @ExcelProperty(value = "健康状况", index = 20)
private String healthy;
- @ExcelProperty(value = "工作单位", index = 16)
+ @ExcelProperty(value = "血型", index = 21)
+ private String bloodType;
+
+ @ExcelProperty(value = "宗教信仰", index = 22)
+ private String religion;
+
+ @ExcelProperty(value = "职业", index = 23)
+ private String profession;
+
+ @ExcelProperty(value = "工作单位/学校", index = 24)
private String workCompany;
- @ExcelProperty(value = "外地or本地", index = 17)
- private String outOrLocal;
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 25)
+ private Integer outOrLocal;
- @ExcelProperty(value = "户口所在地", index = 18)
+ @ExcelProperty(value = "户口所在地", index = 26)
private String censusRegister;
- @ExcelProperty(value = "备注", index = 19)
+ @ExcelProperty(value = "是否居住地 1是 、0否", index = 27)
+ private Integer residence;
+
+ @ExcelProperty(value = "居住地址", index = 28)
+ private String address;
+
+ @ExcelProperty(value = "人员类型（1、户籍人员2、留守人员3、外地人员4、境外人员）", index = 29)
+ private Integer personType;
+
+ @ExcelProperty(value = "国家", index = 30)
+ private String country;
+
+ @ExcelProperty(value = "离开日期（境外人员填写）", index = 31)
+ private Date dateOfDeparture;
+
+ @ExcelProperty(value = "人员状态", index = 32)
+ private String personStatus;
+
+ @ExcelProperty(value = "月收入情况", index = 33)
+ private String monthlyIncome;
+
+ @ExcelProperty(value = "家庭情况", index = 34)
+ private String familyStatus;
+
+ @ExcelProperty(value = "来华目的（境外人员填写）", index = 35)
+ private String goalInChina;
+
+ @ExcelProperty(value = "抵达日期（境外人员填写）", index = 36)
+ private Date dateOfArrival;
+
+ @ExcelProperty(value = "备注", index = 37)
private String remark;
+ @ExcelProperty(value = "证件照（人面像）照片", index = 38)
+ private String idCardPositive;
+
+ @ExcelProperty(value = "证件照（国徽面）照片", index = 39)
+ private String idCardBack;
+
+ @ExcelProperty(value = "户口本照片", index = 40)
+ private String houseHold;
+
+ @ExcelProperty(value = "是否死亡(是/否)", index = 41)
+ private Integer death;
+
+ @ExcelProperty(value = "退役军人(是/否)", index = 42)
+ private Integer veterans;
+
+ @ExcelProperty(value = "残疾人(是/否)", index = 43)
+ private Integer disabled;
+
+ @ExcelProperty(value = "低保户(是/否)", index = 44)
+ private Integer lowIncomeHold;
+
+ @ExcelProperty(value = "低收入人员(是/否)", index = 45)
+ private Integer lowIncome;
+
+ @ExcelProperty(value = "高龄老人(是/否)", index = 46)
+ private Integer elder;
+
+ @ExcelProperty(value = "特服家庭(是/否)", index = 47)
+ private Integer specialFamily;
+
+ @ExcelProperty(value = "重点人员(是/否)", index = 48)
+ private Integer important;
+
+ @ExcelProperty(value = "特殊情况（重大病史/孕）(是/否)", index = 49)
+ private Integer specialCase;
+
+ @ExcelProperty(value = "错误信息", index = 50)
+ private Integer mistake;
+
+
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
private Integer age;
+ /**
+ * 性别（1.男 2.女）
+ */
private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
/**
* 扩展字段用逗号隔开
*/
private List<String> userTagStr = Lists.newArrayList();
+ private Long houseId;
+
+
}
--
Gitblit v1.7.1