From 7034041e18f2354ac0f4b852f17a09b2144e1091 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 13 五月 2021 09:31:51 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 104 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 69 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..3f09a50 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,80 @@
@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;
+
+ @ExcelProperty(value = "街路巷", index = 6)
+ private String road;
+
+ @ExcelProperty(value = "门牌号", index = 7)
+ private Integer doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 8)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 9)
+ private Integer unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 10)
+ private Integer houseNo;
+
+ @ExcelProperty(value = "联系方式", index = 11)
private String phone;
- @ExcelProperty(value = "籍贯" ,index = 13)
+ @ExcelProperty(value = "籍贯", index = 12)
private String nativePlace;
- @ExcelProperty(value = "工作单位" ,index = 14)
+ @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 = "外地or本地（1.本地 2.外地）", index = 17)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 18)
+ private String censusRegister;
+
+ @ExcelProperty(value = "备注", index = 19)
+ private String remark;
+
+ private Integer age;
+
+ private Integer sex;
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ /**
+ * 外地or本地(1.本地 2.外地)
+ */
+ public interface outOrLocal{
+ String bd = "本地";
+ String wd = "外地";
+ }
+
}
--
Gitblit v1.7.1