From 7ff86ee9adfb437273af3f3c6dc4adf956a34a8b Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 11 八月 2021 09:07:52 +0800
Subject: [PATCH] 实有人口新增模板导入接口开发
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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..c0ad895 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();
@@ -338,10 +340,16 @@
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))){
+ vo.setIsExternalPublicity(Integer.valueOf(oneData.get(22).trim()));
+ }
+ 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 +439,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