From 929ff93a7a9db5b9fb0e3ce8e45a66ce59ea1767 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 11 八月 2021 17:53:57 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java | 152 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 125 insertions(+), 27 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
index c459757..f20d7f2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.listen;
+import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.context.AnalysisContext;
@@ -130,6 +131,7 @@
int index = 2;
try {
+ String[] parsePatterns = new String[]{"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd", "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
ArrayList<ComMngPopulationRehabilitationExcelVO> voList = Lists.newArrayList();
// List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
ArrayList<ComMngPopulationRehabilitationMistakeExcelVO> mistakes = Lists.newArrayList();
@@ -214,33 +216,39 @@
continue;
}
vo.setDoorNo(oneData.get(7).trim());
- if(StringUtils.isEmpty(oneData.get(8))){
- index++;
- ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
- setRehabilitationMistake(oneData, mistake);
- mistake.setMistake("楼排号不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(8))){
+// index++;
+// ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+// setRehabilitationMistake(oneData, mistake);
+// mistake.setMistake("楼排号不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setFloor(oneData.get(8).trim());
}
- vo.setFloor(oneData.get(8).trim());
- if(StringUtils.isEmpty(oneData.get(9))){
- index++;
- ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
- setRehabilitationMistake(oneData, mistake);
- mistake.setMistake("单元号不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(9))){
+// index++;
+// ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+// setRehabilitationMistake(oneData, mistake);
+// mistake.setMistake("单元号不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(9))) {
+ vo.setUnitNo(oneData.get(9).trim());
}
- vo.setUnitNo(oneData.get(9).trim());
- if(StringUtils.isEmpty(oneData.get(10))){
- index++;
- ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
- setRehabilitationMistake(oneData, mistake);
- mistake.setMistake("户室不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(10))){
+// index++;
+// ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+// setRehabilitationMistake(oneData, mistake);
+// mistake.setMistake("户室不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(10))) {
+ vo.setHouseNo(oneData.get(10).trim());
}
- vo.setHouseNo(oneData.get(10).trim());
if(StringUtils.isNotEmpty(oneData.get(11))){
Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(11));
if(isOk.equals(-1)){
@@ -341,10 +349,83 @@
vo.setIsRehab(PopulHouseUseEnum.getCodeByName("否"));
}
if(StringUtils.isNotEmpty(oneData.get(21))){
- vo.setRemark(oneData.get(21).trim());
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(21));
+ if(isOk.equals(-1)){
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否累惯犯有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRecidivist(isOk);
+ }else {
+ vo.setIsRecidivist(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(22))){
+ vo.setOriginalTerm(oneData.get(22).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(23))){
+ vo.setSentenceBegin(DateUtil.parse(oneData.get(23).trim()));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(24))){
+ vo.setOriginalCharge(oneData.get(24).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(25))){
+ vo.setSentenceEnd(DateUtil.parse(oneData.get(25).trim()));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(26))){
+ vo.setSentencePlace(oneData.get(26).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(27))){
+ vo.setRiskAssessment(oneData.get(27).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(28))){
+ vo.setJoinDate(DateUtil.parse(oneData.get(28).trim()));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(29))){
+ vo.setJoinSituation(oneData.get(29).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(30))){
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(30));
+ if(isOk.equals(-1)){
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否重新犯罪有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsAgainCrime(isOk);
+ }else {
+ vo.setIsAgainCrime(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(31))){
+ vo.setAgainCrimeName(oneData.get(31).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(32))){
+ vo.setPlaceSituation(oneData.get(32).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(33))){
+ vo.setPlaceDate(DateUtil.parse(oneData.get(33).trim()));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(34))){
+ vo.setNotPlaceReason(oneData.get(34).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(35))){
+ vo.setHelpBegin(DateUtil.parse(oneData.get(35).trim()));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(36))){
+ vo.setHelpEnd(DateUtil.parse(oneData.get(36).trim()));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(37))){
+ vo.setHelpSituation(oneData.get(37).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(38))){
+ vo.setRemark(oneData.get(38).trim());
}
vo.getUserTagStr().add("刑满释放");
- for (int i = 22; i < headSize; i++) {
+ for (int i = 39; i < headSize; i++) {
if (oneData.get(i) != null && oneData.get(i).equals("是")) {
vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
}
@@ -434,7 +515,24 @@
vo.setPatientRelation(map.get(18));
vo.setRehabReasonAndType(map.get(19));
vo.setIsRehab(map.get(20));
- vo.setRemark(map.get(21));
+ vo.setIsRecidivist(map.get(21));
+ vo.setOriginalTerm(map.get(22));
+ vo.setSentenceBegin(map.get(23));
+ vo.setOriginalCharge(map.get(24));
+ vo.setSentenceEnd(map.get(25));
+ vo.setSentencePlace(map.get(26));
+ vo.setRiskAssessment(map.get(27));
+ vo.setJoinDate(map.get(28));
+ vo.setJoinSituation(map.get(29));
+ vo.setIsAgainCrime(map.get(30));
+ vo.setAgainCrimeName(map.get(31));
+ vo.setPlaceSituation(map.get(32));
+ vo.setPlaceDate(map.get(33));
+ vo.setNotPlaceReason(map.get(34));
+ vo.setHelpBegin(map.get(35));
+ vo.setHelpEnd(map.get(36));
+ vo.setHelpSituation(map.get(37));
+ vo.setRemark(map.get(38));
}
private R mistakeExportPopulation(List<ComMngPopulationMistakeExcelVO> vo) {
--
Gitblit v1.7.1