From 62c8ce18992be21e88d29a4357a14555150c0b48 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 16 六月 2021 19:08:34 +0800
Subject: [PATCH] 合并一标三实代码
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 101 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 71 insertions(+), 30 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 59abcbf..e512519 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
@@ -31,11 +31,12 @@
@ExcelProperty(value = "与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)", index = 5)
private Integer relation;
+ private String relationStr;
@ExcelProperty(value = "街路巷", index = 6)
private String road;
- @ExcelProperty(value = "门牌号", index = 7)
+ @ExcelProperty(value = "小区号", index = 7)
private String doorNo;
@ExcelProperty(value = "楼排号", index = 8)
@@ -47,43 +48,83 @@
@ExcelProperty(value = "户室（房间号）", index = 10)
private String houseNo;
- @ExcelProperty(value = "联系方式", index = 11)
- private String phone;
+ @ExcelProperty(value = "建筑用途", index = 11)
+ private String buildPurpose;
- @ExcelProperty(value = "籍贯", index = 12)
- private String nativePlace;
+ @ExcelProperty(value = "建筑面积", index = 12)
+ private String buildArea;
- @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 13)
- private Integer cultureLevel;
-
- @ExcelProperty(value = "婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)", index = 14)
- private Integer marriage;
-
- @ExcelProperty(value = "健康状况", index = 15)
- private String healthy;
-
- @ExcelProperty(value = "工作单位", index = 16)
- private String workCompany;
-
- @ExcelProperty(value = "备注", index = 17)
- private String remark;
-
- @ExcelProperty(value = "户口所在地", index = 18)
- private String censusRegister;
-
- @ExcelProperty(value = "外地or本地（1.本地 2.外地）", index = 19)
- private Integer outOrLocal;
-
- @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 20)
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 13)
private Integer houseStatus;
- @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 21)
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 14)
private Integer housePurpose;
- @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 22)
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 15)
private Integer controlStatus;
- @ExcelProperty(value = "是否是居住地(1.是 2.否)", index = 23)
+ @ExcelProperty(value = "联系方式", index = 16)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 17)
+ private String nativePlace;
+
+ @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 18)
+ private Integer cultureLevel;
+
+ @ExcelProperty(value = "婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)", index = 19)
+ private Integer marriage;
+
+ private String marriageStr;
+
+ @ExcelProperty(value = "健康状况", index = 20)
+ private String healthy;
+
+ @ExcelProperty(value = "工作单位", index = 21)
+ private String workCompany;
+
+ @ExcelProperty(value = "外地or本地（1.本地 2.外地）", index = 22)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 23)
+ private String censusRegister;
+
+ @ExcelProperty(value = "备注", index = 24)
+ private String remark;
+
+ @ExcelProperty(value = "证件照（人面像）照片", index = 25)
+ private String idCardPositive;
+
+ @ExcelProperty(value = "证件照（国徽面）照片", index = 26)
+ private String idCardBack;
+
+ @ExcelProperty(value = "户口本照片", index = 27)
+ private String houseHold;
+
+ @ExcelProperty(value = "退役军人(是/否)", index = 28)
+ private Integer veterans;
+
+ @ExcelProperty(value = "残疾人(是/否)", index = 29)
+ private Integer disabled;
+
+ @ExcelProperty(value = "低保户(是/否)", index = 30)
+ private Integer lowIncomeHold;
+
+ @ExcelProperty(value = "低收入人员(是/否)", index = 31)
+ private Integer lowIncome;
+
+ @ExcelProperty(value = "高龄老人(是/否)", index = 32)
+ private Integer elder;
+
+ @ExcelProperty(value = "特服家庭(是/否)", index = 33)
+ private Integer specialFamily;
+
+ @ExcelProperty(value = "重点人员(是/否)", index = 34)
+ private Integer important;
+
+ @ExcelProperty(value = "特殊情况（重大病史/孕）(是/否)", index = 35)
+ private Integer specialCase;
+
private Integer isResidence;
/**
--
Gitblit v1.7.1