From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugExcelVO.java |   50 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugExcelVO.java
index 0bd7b14..2f01147 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugExcelVO.java
@@ -1,14 +1,15 @@
 package com.panzhihua.common.model.vos.community;
 
+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;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
+import lombok.Data;
 
 /**
  * @description: 批量导入吸毒人员
@@ -17,6 +18,9 @@
 @Data
 @EncryptDecryptClass
 public class ComMngPopulationDrugExcelVO implements Serializable {
+
+    @ExcelProperty(value = "序号", index = 0)
+    private String serialNumber;
 
     @ExcelProperty(value = "姓名", index = 1)
     private String name;
@@ -64,9 +68,41 @@
     @ExcelProperty(value = "户口所在地", index = 15)
     private String censusRegister;
 
-    @ExcelProperty(value = "备注", index = 16)
-    private String remark;
+    @ExcelProperty(value = "初次发现日期", index = 16)
+    private Date firstDate;
 
+    @ExcelProperty(value = "管控情况", index = 17)
+    private String controlSituation;
+
+    @ExcelProperty(value = "管控人姓名", index = 18)
+    private String controlPerson;
+
+    @ExcelProperty(value = "管控人联系方式", index = 19)
+    private String controlPersonPhone;
+
+    @ExcelProperty(value = "帮扶情况", index = 20)
+    private String helpSituation;
+
+    @ExcelProperty(value = "帮扶人姓名", index = 21)
+    private String helpPerson;
+
+    @ExcelProperty(value = "帮扶人联系方式", index = 22)
+    private String helpPersonPhone;
+
+    @ExcelProperty(value = "吸毒原因", index = 23)
+    private String drugReason;
+
+    @ExcelProperty(value = "吸毒后果", index = 24)
+    private String drugResult;
+
+    @ExcelProperty(value = "有无犯罪史", index = 25)
+    private String haveCrime;
+
+    @ExcelProperty(value = "违法犯罪情况", index = 26)
+    private String crimeSutiation;
+
+    @ExcelProperty(value = "备注", index = 27)
+    private String remark;
 
     /**
      * 去重字段,使用(姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室)组合字段进行MD5加密实现去重
@@ -79,7 +115,7 @@
     private Integer age;
 
     /**
-     * 性别(1.男  2.女)
+     * 性别(1.男 2.女)
      */
     private Integer sex;
 

--
Gitblit v1.7.1