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/ComMngPopulationRehabilitationMistakeExcelVO.java |   62 ++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationMistakeExcelVO.java
index b82350c..923018b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationMistakeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationMistakeExcelVO.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: 批量导入刑释人员
@@ -81,9 +80,60 @@
     @ExcelProperty(value = "是否列管", index = 20)
     private String isRehab;
 
-    @ExcelProperty(value = "备注", index = 21)
+    @ExcelProperty(value = "是否累惯犯(1.是 0.否)", index = 21)
+    private String isRecidivist;
+
+    @ExcelProperty(value = "原判刑期", index = 22)
+    private String originalTerm;
+
+    @ExcelProperty(value = "服刑日期", index = 23)
+    private String sentenceBegin;
+
+    @ExcelProperty(value = "原罪名", index = 24)
+    private String originalCharge;
+
+    @ExcelProperty(value = "释放日期", index = 25)
+    private String sentenceEnd;
+
+    @ExcelProperty(value = "服刑场所", index = 26)
+    private String sentencePlace;
+
+    @ExcelProperty(value = "危险性评估", index = 27)
+    private String riskAssessment;
+
+    @ExcelProperty(value = "衔接日期", index = 28)
+    private String joinDate;
+
+    @ExcelProperty(value = "衔接情况", index = 29)
+    private String joinSituation;
+
+    @ExcelProperty(value = "是否重新犯罪(1.是 0.否)", index = 30)
+    private String isAgainCrime;
+
+    @ExcelProperty(value = "重新犯罪名称", index = 31)
+    private String againCrimeName;
+
+    @ExcelProperty(value = "安置情况", index = 32)
+    private String placeSituation;
+
+    @ExcelProperty(value = "安置日期", index = 33)
+    private String placeDate;
+
+    @ExcelProperty(value = "未安置原因", index = 34)
+    private String notPlaceReason;
+
+    @ExcelProperty(value = "帮教开始", index = 35)
+    private String helpBegin;
+
+    @ExcelProperty(value = "帮教结束", index = 36)
+    private String helpEnd;
+
+    @ExcelProperty(value = "帮教情况", index = 37)
+    private String helpSituation;
+
+    @ExcelProperty(value = "备注", index = 38)
     private String remark;
 
-    @ExcelProperty(value = "错误信息", index = 22)
+    @ExcelProperty(value = "错误信息", index = 39)
     private String mistake;
 }

--
Gitblit v1.7.1