From 764c152882aefa0735f00d70e7a8e9ad720e0dc2 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 16 八月 2021 16:39:34 +0800
Subject: [PATCH] 实有人口导入bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 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 aaaa63a..e0cde1d 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.DateException;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
@@ -31,6 +32,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -412,10 +414,32 @@
                         vo.setNotPlaceReason(oneData.get(34).trim());
                     }
                     if(StringUtils.isNotEmpty(oneData.get(35))){
-                        vo.setHelpBegin(DateUtil.parse(oneData.get(35).trim()));
+                        try {
+                            vo.setHelpBegin(DateUtil.parse(oneData.get(35).trim()));
+                        } catch (DateException e) {
+                            log.info("处理数据时失败");
+                            e.printStackTrace();
+                            ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+                            index++;
+                            setRehabilitationMistake(oneData, mistake);
+                            mistake.setMistake("您填写的帮教开始日期有误");
+                            mistakes.add(mistake);
+                            continue;
+                        }
                     }
                     if(StringUtils.isNotEmpty(oneData.get(36))){
-                        vo.setHelpEnd(DateUtil.parse(oneData.get(36).trim()));
+                        try {
+                            vo.setHelpEnd(DateUtil.parse(oneData.get(36).trim()));
+                        } catch (DateException e) {
+                            log.info("处理数据时失败");
+                            e.printStackTrace();
+                            ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+                            index++;
+                            setRehabilitationMistake(oneData, mistake);
+                            mistake.setMistake("您填写的帮教结束日期有误");
+                            mistakes.add(mistake);
+                            continue;
+                        }
                     }
                     if(StringUtils.isNotEmpty(oneData.get(37))){
                         vo.setHelpSituation(oneData.get(37).trim());

--
Gitblit v1.7.1