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/ComMngPopulationCorrectMistakeExcelVO.java |  101 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 90 insertions(+), 11 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectMistakeExcelVO.java
index 342862e..85652f5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectMistakeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectMistakeExcelVO.java
@@ -1,11 +1,12 @@
 package com.panzhihua.common.model.vos.community;
 
+import java.io.Serializable;
+
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
-import lombok.Data;
 
-import java.io.Serializable;
+import lombok.Data;
 
 /**
  * @description: 批量导入社区矫正人员
@@ -64,21 +65,99 @@
     @ExcelProperty(value = "户口所在地", index = 15)
     private String censusRegister;
 
-    @ExcelProperty(value = "矫正开始时间", index = 16)
-    private String correctBegin;
+    @ExcelProperty(value = "学历", index = 16)
+    private String cultureLevel;
 
-    @ExcelProperty(value = "矫正结束时间", index = 17)
-    private String correctEnd;
+    @ExcelProperty(value = "社区矫正人员编号", index = 17)
+    private String correctPersonCode;
 
-    @ExcelProperty(value = "矫正类型", index = 18)
+    @ExcelProperty(value = "原羁押场所", index = 18)
+    private String originalCustodyplace;
+
+    @ExcelProperty(value = "矫正类别", index = 19)
     private String correctType;
 
-    @ExcelProperty(value = "罪名", index = 19)
-    private String charges;
+    @ExcelProperty(value = "案件类别", index = 20)
+    private String caseType;
 
-    @ExcelProperty(value = "备注", index = 20)
+    @ExcelProperty(value = "具体罪名", index = 21)
+    private String specificCharge;
+
+    @ExcelProperty(value = "原判刑期", index = 22)
+    private String originalTerm;
+
+    @ExcelProperty(value = "原判刑开始日期", index = 23)
+    private String originalTermBegin;
+
+    @ExcelProperty(value = "原判刑结束日期", index = 24)
+    private String originalTermEnd;
+
+    @ExcelProperty(value = "矫正开始时间", index = 25)
+    private String correctBegin;
+
+    @ExcelProperty(value = "矫正结束时间", index = 26)
+    private String correctEnd;
+
+    @ExcelProperty(value = "接收方式", index = 27)
+    private String receiveMethod;
+
+    @ExcelProperty(value = "是否累惯犯(1.是 0.否)", index = 28)
+    private String isRecidivist;
+
+    @ExcelProperty(value = "四史情况", index = 29)
+    private String fourHistory;
+
+    @ExcelProperty(value = "三涉情况", index = 30)
+    private String threeInvovle;
+
+    @ExcelProperty(value = "是否建立矫正小组(1.是 0.否)", index = 31)
+    private String isCorrectGroup;
+
+    @ExcelProperty(value = "矫正小组人员组成情况", index = 32)
+    private String correctGroupConstitute;
+
+    @ExcelProperty(value = "矫正解除(终止)类型", index = 33)
+    private String correctRelieveType;
+
+    @ExcelProperty(value = "是否有脱管(1.是 0.否)", index = 34)
+    private String isOutControl;
+
+    @ExcelProperty(value = "脱管原因", index = 35)
+    private String outControlReason;
+
+    @ExcelProperty(value = "脱管纠正情况", index = 36)
+    private String outControlCorrect;
+
+    @ExcelProperty(value = "检察监督脱管情况", index = 37)
+    private String inspectOutControl;
+
+    @ExcelProperty(value = "是否有漏管(1.是 0.否)", index = 38)
+    private String isMissControl;
+
+    @ExcelProperty(value = "漏管原因", index = 39)
+    private String missControlReason;
+
+    @ExcelProperty(value = "漏管纠正情况", index = 40)
+    private String missControlCorrect;
+
+    @ExcelProperty(value = "检察监督漏管", index = 41)
+    private String inspectMissControl;
+
+    @ExcelProperty(value = "奖惩情况", index = 42)
+    private String rewardAndPunishiment;
+
+    @ExcelProperty(value = "是否重新犯罪(1.是 0.否)", index = 43)
+    private String isAgainCrime;
+
+    @ExcelProperty(value = "重新犯罪名称", index = 44)
+    private String againCrimeName;
+
+    @ExcelProperty(value = "刑罚变更执行情况", index = 45)
+    private String pubishmentChange;
+
+    @ExcelProperty(value = "备注", index = 46)
     private String remark;
 
-    @ExcelProperty(value = "错误信息", index = 21)
+    @ExcelProperty(value = "错误信息", index = 47)
     private String mistake;
 }

--
Gitblit v1.7.1