From ab60d6eb8b4a23a55ad202a56ef91cda9fd6fb37 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 23 七月 2022 14:31:56 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java | 72 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java
index cb03286..942caf3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java
@@ -1,13 +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.List;
+import lombok.Data;
/**
* @description: 批量导入刑释人员
@@ -16,6 +18,9 @@
@Data
@EncryptDecryptClass
public class ComMngPopulationRehabilitationExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
@ExcelProperty(value = "姓名", index = 1)
private String name;
@@ -78,8 +83,60 @@
@ExcelProperty(value = "是否列管", index = 20)
private Integer isRehab;
- @ExcelProperty(value = "备注", index = 21)
+ @ExcelProperty(value = "是否累惯犯（1.是 0.否）", index = 21)
+ private Integer isRecidivist;
+
+ @ExcelProperty(value = "原判刑期", index = 22)
+ private String originalTerm;
+
+ @ExcelProperty(value = "服刑日期", index = 23)
+ private Date sentenceBegin;
+
+ @ExcelProperty(value = "原罪名", index = 24)
+ private String originalCharge;
+
+ @ExcelProperty(value = "释放日期", index = 25)
+ private Date sentenceEnd;
+
+ @ExcelProperty(value = "服刑场所", index = 26)
+ private String sentencePlace;
+
+ @ExcelProperty(value = "危险性评估", index = 27)
+ private String riskAssessment;
+
+ @ExcelProperty(value = "衔接日期", index = 28)
+ private Date joinDate;
+
+ @ExcelProperty(value = "衔接情况", index = 29)
+ private String joinSituation;
+
+ @ExcelProperty(value = "是否重新犯罪（1.是 0.否）", index = 30)
+ private Integer isAgainCrime;
+
+ @ExcelProperty(value = "重新犯罪名称", index = 31)
+ private String againCrimeName;
+
+ @ExcelProperty(value = "安置情况", index = 32)
+ private String placeSituation;
+
+ @ExcelProperty(value = "安置日期", index = 33)
+ private Date placeDate;
+
+ @ExcelProperty(value = "未安置原因", index = 34)
+ private String notPlaceReason;
+
+ @ExcelProperty(value = "帮教开始", index = 35)
+ private Date helpBegin;
+
+ @ExcelProperty(value = "帮教结束", index = 36)
+ private Date helpEnd;
+
+ @ExcelProperty(value = "帮教情况", index = 37)
+ private String helpSituation;
+
+ @ExcelProperty(value = "备注", index = 38)
private String remark;
+
/**
* 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
*/
@@ -91,7 +148,7 @@
private Integer age;
/**
- * 性别（1.男 2.女）
+ * 性别（1.男 2.女）
*/
private Integer sex;
@@ -106,4 +163,9 @@
private List<String> userTagStr = Lists.newArrayList();
private Long houseId;
+
+ /**
+ * 地址
+ */
+ private String address;
}
--
Gitblit v1.7.1