From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:28:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java | 94 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 86 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java
index 385d4f5..92bc6c2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java
@@ -67,19 +67,97 @@
@ExcelProperty(value = "户口所在地", index = 15)
private String censusRegister;
- @ExcelProperty(value = "矫正开始时间", index = 16)
- private Date correctBegin;
+ @ExcelProperty(value = "学历", index = 16)
+ private Integer cultureLevel;
- @ExcelProperty(value = "矫正结束时间", index = 17)
- private Date 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 Date originalTermBegin;
+
+ @ExcelProperty(value = "原判刑结束日期", index = 24)
+ private Date originalTermEnd;
+
+ @ExcelProperty(value = "矫正开始时间", index = 25)
+ private Date correctBegin;
+
+ @ExcelProperty(value = "矫正结束时间", index = 26)
+ private Date correctEnd;
+
+ @ExcelProperty(value = "接收方式", index = 27)
+ private String receiveMethod;
+
+ @ExcelProperty(value = "是否累惯犯（1.是 0.否）", index = 28)
+ private Integer isRecidivist;
+
+ @ExcelProperty(value = "四史情况", index = 29)
+ private String fourHistory;
+
+ @ExcelProperty(value = "三涉情况", index = 30)
+ private String threeInvovle;
+
+ @ExcelProperty(value = "是否建立矫正小组（1.是 0.否）", index = 31)
+ private Integer isCorrectGroup;
+
+ @ExcelProperty(value = "矫正小组人员组成情况", index = 32)
+ private String correctGroupConstitute;
+
+ @ExcelProperty(value = "矫正解除（终止）类型", index = 33)
+ private String correctRelieveType;
+
+ @ExcelProperty(value = "是否有脱管（1.是 0.否）", index = 34)
+ private Integer 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 Integer 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 Integer isAgainCrime;
+
+ @ExcelProperty(value = "重新犯罪名称", index = 44)
+ private String againCrimeName;
+
+ @ExcelProperty(value = "刑罚变更执行情况", index = 45)
+ private String pubishmentChange;
+
+ @ExcelProperty(value = "备注", index = 46)
private String remark;
--
Gitblit v1.7.1