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/ComMngPopulationDrugMistakeExcelVO.java |   77 ++++++++++++++++++++++++++++----------
 1 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java
index bd5264b..fc01eb1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java
@@ -1,13 +1,12 @@
 package com.panzhihua.common.model.vos.community;
 
+import java.io.Serializable;
+
 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.List;
+import lombok.Data;
 
 /**
  * @description: 批量导入吸毒人员
@@ -17,55 +16,91 @@
 @EncryptDecryptClass
 public class ComMngPopulationDrugMistakeExcelVO implements Serializable {
 
-    @ExcelProperty(value = "姓名", index = 0)
+    @ExcelProperty(value = "序号", index = 0)
+    private String serialNumber;
+
+    @ExcelProperty(value = "姓名", index = 1)
     private String name;
 
-    @ExcelProperty(value = "身份证号码", index = 2)
+    @ExcelProperty(value = "身份证号码", index = 3)
     @EncryptDecryptField
     private String cardNo;
 
-    @ExcelProperty(value = "民族", index = 1)
+    @ExcelProperty(value = "民族", index = 2)
     private String nation;
 
-    @ExcelProperty(value = "联系电话", index = 3)
+    @ExcelProperty(value = "联系电话", index = 4)
     private String phone;
 
-    @ExcelProperty(value = "是否租住", index = 9)
+    @ExcelProperty(value = "是否租住", index = 10)
     private String isRent;
 
-    @ExcelProperty(value = "街/路/巷", index = 4)
+    @ExcelProperty(value = "街/路/巷", index = 5)
     private String road;
 
-    @ExcelProperty(value = "小区号", index = 5)
+    @ExcelProperty(value = "小区号", index = 6)
     private String doorNo;
 
-    @ExcelProperty(value = "楼排号", index = 6)
+    @ExcelProperty(value = "楼排号", index = 7)
     private String floor;
 
-    @ExcelProperty(value = "单元号", index = 7)
+    @ExcelProperty(value = "单元号", index = 8)
     private String unitNo;
 
-    @ExcelProperty(value = "户室(房间号)", index = 8)
+    @ExcelProperty(value = "户室(房间号)", index = 9)
     private String houseNo;
 
-    @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 10)
+    @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 11)
     private String houseStatus;
 
-    @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)", index = 11)
+    @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)", index = 12)
     private String housePurpose;
 
-    @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 12)
+    @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 13)
     private String controlStatus;
 
-    @ExcelProperty(value = "外地/本地(1.本地  2.外地)", index = 13)
+    @ExcelProperty(value = "外地/本地(1.本地  2.外地)", index = 14)
     private String outOrLocal;
 
-    @ExcelProperty(value = "户口所在地", index = 14)
+    @ExcelProperty(value = "户口所在地", index = 15)
     private String censusRegister;
 
-    @ExcelProperty(value = "备注", index = 15)
+    @ExcelProperty(value = "初次发现日期", index = 16)
+    private String 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;
 
-    @ExcelProperty(value = "错误信息", index = 16)
+    @ExcelProperty(value = "错误信息", index = 28)
     private String mistake;
 }

--
Gitblit v1.7.1