From 5f4018c7ab5a13c5f3ae5a0155a121e150f4ad74 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 14 七月 2022 14:15:33 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into huacheng_zts
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java | 53 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
index 90aa740..2d983e9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
@@ -1,14 +1,14 @@
package com.panzhihua.common.model.vos.community;
+import java.io.Serializable;
+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;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
+import lombok.Data;
/**
* @description: 批量导入重精人员
@@ -67,21 +67,44 @@
@ExcelProperty(value = "经济状况", index = 15)
private String economicCondition;
- @ExcelProperty(value = "监护人", index = 16)
- private String guarDian;
+ @ExcelProperty(value = "人员类型", index = 16)
+ private String personType;
- @ExcelProperty(value = "监护人联系电话", index = 17)
- private String guarDianPhone;
+ @ExcelProperty(value = "家庭情况", index = 17)
+ private String familySituation;
- @ExcelProperty(value = "与患者关系", index = 18)
- private Integer patientRelation;
+ @ExcelProperty(value = "监护人姓名", index = 18)
+ private String custodyPerson;
- @ExcelProperty(value = "目前诊断", index = 19)
- private String diagnose;
+ @ExcelProperty(value = "与监护人关系", index = 19)
+ private String custodyRelation;
- @ExcelProperty(value = "其他", index = 20)
- private String other;
+ @ExcelProperty(value = "监护人公民身份号码", index = 20)
+ private String custodyCardNo;
+ @ExcelProperty(value = "监护人联系方式", index = 21)
+ private String custodyPersonPhone;
+
+ @ExcelProperty(value = "监护人居住详址", index = 22)
+ private String custodyAddress;
+
+ @ExcelProperty(value = "帮扶人姓名", index = 23)
+ private String helpPerson;
+
+ @ExcelProperty(value = "帮扶人联系方式", index = 24)
+ private String helpPersonPhone;
+
+ @ExcelProperty(value = "帮扶手段", index = 25)
+ private String helpMethod;
+
+ @ExcelProperty(value = "帮扶情况", index = 26)
+ private String helpSituation;
+
+ @ExcelProperty(value = "是否违法犯罪（1.是 0.否）", index = 27)
+ private Integer isCrime;
+
+ @ExcelProperty(value = "违法犯罪情况", index = 28)
+ private String crimeSutiation;
/**
* 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
@@ -94,7 +117,7 @@
private Integer age;
/**
- * 性别（1.男 2.女）
+ * 性别（1.男 2.女）
*/
private Integer sex;
--
Gitblit v1.7.1