From 1c8ed0e3e18d6ed97879cb2925db914a9d487314 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 17 六月 2021 14:47:03 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 172 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 137 insertions(+), 35 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 82a0980..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
@@ -1,9 +1,11 @@
package com.panzhihua.common.model.vos.community;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
import lombok.Data;
import java.io.Serializable;
+import java.util.List;
/**
* @description: 批量导入实有人口
@@ -12,48 +14,148 @@
@Data
public class ComMngPopulationServeExcelVO implements Serializable {
- @ExcelProperty(value = "家庭成员（姓名）" ,index = 0)
+ @ExcelProperty(value = "姓名", index = 0)
private String name;
- @ExcelProperty(value = "性别（1.男 2.女 3.未知）" ,index = 1)
- private Integer sex;
-
- @ExcelProperty(value = "年龄" ,index = 2)
- private Integer age;
-
- @ExcelProperty(value = "是否租住" ,index = 3)
- private Integer adsf;
-
- @ExcelProperty(value = "街路巷" ,index = 4)
- private String road;
-
- @ExcelProperty(value = "门牌号" ,index = 5)
- private Integer doorNo;
-
- @ExcelProperty(value = "楼排号" ,index = 6)
- private String floor;
-
- @ExcelProperty(value = "单元号" ,index = 7)
- private Integer unitNo;
-
- @ExcelProperty(value = "户室（房间号）" ,index = 8)
- private Integer houseNo;
-
- @ExcelProperty(value = "民族" ,index = 9)
- private String nation;
-
- @ExcelProperty(value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)" ,index = 10)
- private Integer politicalOutlook;
-
- @ExcelProperty(value = "身份证号码" ,index = 11)
+ @ExcelProperty(value = "身份证号码", index = 1)
private String cardNo;
- @ExcelProperty(value = "联系方式" ,index = 12)
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "政治面貌", index = 3)
+ private Integer politicalOutlook;
+
+ @ExcelProperty(value = "是否租住", index = 4)
+ private Integer isRent;
+
+ @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)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 8)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 9)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 10)
+ private String houseNo;
+
+ @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 = 13)
+ @ExcelProperty(value = "籍贯", index = 17)
private String nativePlace;
- @ExcelProperty(value = "工作单位" ,index = 14)
+ @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;
+
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 房屋地址
+ */
+ private String address;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+
}
--
Gitblit v1.7.1