From 10df7e29b51d6a2efacc83d870856f57d97a9b66 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期一, 24 十月 2022 13:48:24 +0800 Subject: [PATCH] #feat 修改别名 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java | 66 ++++++++++++++++++++++++++++++--- 1 files changed, 60 insertions(+), 6 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 8581632..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: 批量导入刑释人员 @@ -73,7 +75,7 @@ private String mainRelatives; @ExcelProperty(value = "与人员关系", index = 18) - private Integer patientRelation; + private String patientRelation; @ExcelProperty(value = "列管原因及类型", index = 19) private String rehabReasonAndType; @@ -81,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加密实现去重 */ @@ -94,7 +148,7 @@ private Integer age; /** - * 性别(1.男 2.女) + * 性别(1.男 2.女) */ private Integer sex; -- Gitblit v1.7.1