From 4991803c78280508a478c4942b83bf63b48d307b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 13 七月 2022 17:45:58 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 c9d6341..7b48bd8 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,24 +1,29 @@
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.Date;
import java.util.List;
+
+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;
/**
* @description: 批量导入实有人口
* @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)
@@ -105,7 +110,7 @@
@ExcelProperty(value = "居住地址", index = 28)
private String address;
- @ExcelProperty(value = "人员类型（1、户籍人员2、留守人员3、外地人员4、境外人员）", index = 29)
+ @ExcelProperty(value = "人员类型（1、户籍人口2、留守人员3、外地人员4、境外人员5、流动人口6、常住人口7、暂住人口）", index = 29)
private Integer personType;
@ExcelProperty(value = "国家", index = 30)
@@ -144,7 +149,7 @@
@ExcelProperty(value = "是否死亡(是/否)", index = 41)
private Integer death;
- @ExcelProperty(value = "退役军人(是/否)", index = 41)
+ @ExcelProperty(value = "退役军人(是/否)", index = 42)
private Integer veterans;
@ExcelProperty(value = "残疾人(是/否)", index = 43)
@@ -168,6 +173,8 @@
@ExcelProperty(value = "特殊情况（重大病史/孕）(是/否)", index = 49)
private Integer specialCase;
+ @ExcelProperty(value = "错误信息", index = 50)
+ private Integer mistake;
/**
* 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
@@ -180,7 +187,7 @@
private Integer age;
/**
- * 性别（1.男 2.女）
+ * 性别（1.男 2.女）
*/
private Integer sex;
@@ -195,6 +202,5 @@
private List<String> userTagStr = Lists.newArrayList();
private Long houseId;
-
}
--
Gitblit v1.7.1