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/ComMngPopulationCultExcelListen.java | 81 +++++++++++++++++++++++++++-------------
1 files changed, 54 insertions(+), 27 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java
index b2b9906..2f512fe 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.listen;
+import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSONArray;
@@ -120,6 +121,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<ComMngPopulationCultExcelVO> voList = Lists.newArrayList();
// List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
ArrayList<ComMngPopulationCultMistakeExcelVO> mistakes = Lists.newArrayList();
@@ -237,33 +239,39 @@
continue;
}
vo.setDoorNo(oneData.get(9).trim());
- if(StringUtils.isEmpty(oneData.get(10))){
- index++;
- ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
- setMistake(oneData, mistake);
- mistake.setMistake("楼排号不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(10))){
+// index++;
+// ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+// setMistake(oneData, mistake);
+// mistake.setMistake("楼排号不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(10))) {
+ vo.setFloor(oneData.get(10).trim());
}
- vo.setFloor(oneData.get(10).trim());
- if(StringUtils.isEmpty(oneData.get(11))){
- index++;
- ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
- setMistake(oneData, mistake);
- mistake.setMistake("单元号不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(11))){
+// index++;
+// ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+// setMistake(oneData, mistake);
+// mistake.setMistake("单元号不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(11))) {
+ vo.setUnitNo(oneData.get(11).trim());
}
- vo.setUnitNo(oneData.get(11).trim());
- if(StringUtils.isEmpty(oneData.get(12))){
- index++;
- ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
- setMistake(oneData, mistake);
- mistake.setMistake("户室不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(12))){
+// index++;
+// ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+// setMistake(oneData, mistake);
+// mistake.setMistake("户室不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(12))) {
+ vo.setHouseNo(oneData.get(12).trim());
}
- vo.setHouseNo(oneData.get(12).trim());
if(StringUtils.isNotEmpty(oneData.get(13))){
Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(13));
if(isOk.equals(-1)){
@@ -338,10 +346,27 @@
vo.setBasicSituation(oneData.get(20).trim());
}
if(StringUtils.isNotEmpty(oneData.get(21))){
- vo.setRemark(oneData.get(21).trim());
+ vo.setJoinCultDate(DateUtil.parse(oneData.get(21).trim(), parsePatterns));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(22))){
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(22));
+ if(isOk.equals(-1)){
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否对外宣传有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsExternalPublicity(isOk);
+ }else {
+ vo.setIsExternalPublicity(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(23))){
+ vo.setRemark(oneData.get(23).trim());
}
vo.getUserTagStr().add("邪教人员");
- for (int i = 22; i < headSize; i++) {
+ for (int i = 24; i < headSize; i++) {
if (oneData.get(i) != null && oneData.get(i).equals("是")) {
vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
}
@@ -431,7 +456,9 @@
vo.setCensusRegister(map.get(18));
vo.setCultName(map.get(19));
vo.setBasicSituation(map.get(20));
- vo.setRemark(map.get(21));
+ vo.setJoinCultDate(map.get(21));
+ vo.setIsExternalPublicity(map.get(22));
+ vo.setRemark(map.get(23));
}
private String convertMarriage(String ma) {
--
Gitblit v1.7.1