From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 22 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 c5b50d8..4331404 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
@@ -5,6 +5,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
import java.util.List;
/**
@@ -33,7 +34,7 @@
private Integer relation;
private String relationStr;
- @ExcelProperty(value = "街路巷", index = 6)
+ @ExcelProperty(value = "街/路/巷", index = 6)
private String road;
@ExcelProperty(value = "小区号", index = 7)
@@ -80,52 +81,93 @@
@ExcelProperty(value = "健康状况", index = 20)
private String healthy;
- @ExcelProperty(value = "工作单位", index = 21)
+ @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本地（1.本地 2.外地）", index = 22)
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 25)
private Integer outOrLocal;
- @ExcelProperty(value = "户口所在地", index = 23)
+ @ExcelProperty(value = "户口所在地", index = 26)
private String censusRegister;
- @ExcelProperty(value = "备注", index = 24)
+ @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 = 25)
+ @ExcelProperty(value = "证件照（人面像）照片", index = 38)
private String idCardPositive;
- @ExcelProperty(value = "证件照（国徽面）照片", index = 26)
+ @ExcelProperty(value = "证件照（国徽面）照片", index = 39)
private String idCardBack;
- @ExcelProperty(value = "户口本照片", index = 27)
+ @ExcelProperty(value = "户口本照片", index = 40)
private String houseHold;
- @ExcelProperty(value = "退役军人(是/否)", index = 28)
+ @ExcelProperty(value = "是否死亡(是/否)", index = 41)
+ private Integer death;
+
+ @ExcelProperty(value = "退役军人(是/否)", index = 42)
private Integer veterans;
- @ExcelProperty(value = "残疾人(是/否)", index = 29)
+ @ExcelProperty(value = "残疾人(是/否)", index = 43)
private Integer disabled;
- @ExcelProperty(value = "低保户(是/否)", index = 30)
+ @ExcelProperty(value = "低保户(是/否)", index = 44)
private Integer lowIncomeHold;
- @ExcelProperty(value = "低收入人员(是/否)", index = 31)
+ @ExcelProperty(value = "低收入人员(是/否)", index = 45)
private Integer lowIncome;
- @ExcelProperty(value = "高龄老人(是/否)", index = 32)
+ @ExcelProperty(value = "高龄老人(是/否)", index = 46)
private Integer elder;
- @ExcelProperty(value = "特服家庭(是/否)", index = 33)
+ @ExcelProperty(value = "特服家庭(是/否)", index = 47)
private Integer specialFamily;
- @ExcelProperty(value = "重点人员(是/否)", index = 34)
+ @ExcelProperty(value = "重点人员(是/否)", index = 48)
private Integer important;
- @ExcelProperty(value = "特殊情况（重大病史/孕）(是/否)", index = 35)
+ @ExcelProperty(value = "特殊情况（重大病史/孕）(是/否)", index = 49)
private Integer specialCase;
- private Integer isResidence;
/**
* 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
@@ -146,11 +188,6 @@
* 出生年月日
*/
private String birthday;
-
- /**
- * 房屋地址
- */
- private String address;
/**
* 扩展字段用逗号隔开
--
Gitblit v1.7.1