From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 九月 2021 11:30:47 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 dd2eb95..ebf3886 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
@@ -357,13 +357,13 @@
vo.setOriginalTerm(oneData.get(22).trim());
}
if (StringUtils.isNotEmpty(oneData.get(23))) {
- vo.setSentenceBegin(DateUtil.parse(oneData.get(23).trim()));
+ vo.setSentenceBegin(DateUtil.parse(oneData.get(23).trim(), parsePatterns));
}
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()));
+ vo.setSentenceEnd(DateUtil.parse(oneData.get(25).trim(), parsePatterns));
}
if (StringUtils.isNotEmpty(oneData.get(26))) {
vo.setSentencePlace(oneData.get(26).trim());
@@ -372,7 +372,7 @@
vo.setRiskAssessment(oneData.get(27).trim());
}
if (StringUtils.isNotEmpty(oneData.get(28))) {
- vo.setJoinDate(DateUtil.parse(oneData.get(28).trim()));
+ vo.setJoinDate(DateUtil.parse(oneData.get(28).trim(), parsePatterns));
}
if (StringUtils.isNotEmpty(oneData.get(29))) {
vo.setJoinSituation(oneData.get(29).trim());
@@ -399,14 +399,14 @@
vo.setPlaceSituation(oneData.get(32).trim());
}
if (StringUtils.isNotEmpty(oneData.get(33))) {
- vo.setPlaceDate(DateUtil.parse(oneData.get(33).trim()));
+ vo.setPlaceDate(DateUtil.parse(oneData.get(33).trim(), parsePatterns));
}
if (StringUtils.isNotEmpty(oneData.get(34))) {
vo.setNotPlaceReason(oneData.get(34).trim());
}
if (StringUtils.isNotEmpty(oneData.get(35))) {
try {
- vo.setHelpBegin(DateUtil.parse(oneData.get(35).trim()));
+ vo.setHelpBegin(DateUtil.parse(oneData.get(35).trim(), parsePatterns));
} catch (DateException e) {
log.info("处理数据时失败");
e.printStackTrace();
@@ -421,7 +421,7 @@
}
if (StringUtils.isNotEmpty(oneData.get(36))) {
try {
- vo.setHelpEnd(DateUtil.parse(oneData.get(36).trim()));
+ vo.setHelpEnd(DateUtil.parse(oneData.get(36).trim(), parsePatterns));
} catch (DateException e) {
log.info("处理数据时失败");
e.printStackTrace();
--
Gitblit v1.7.1