From bfc843c802307a5f523534cd9e8418698084ab0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 15 Jun 2023 18:12:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E6=90=9C=E7=B4=A2=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/warn/service/LawsWarnService.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index 1887f6bb7..7ab80fe57 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -98,9 +98,13 @@ public class LawsWarnService { //处理法规预警模块预警时间查询条件 flag = 0(新车实施日期), flag = 1(在产车实施日期) String flag = String.valueOf(parameter.get("flag")); if(StringUtils.equals(flag,"0")){ - parameter.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",parameter.get("WarnTime")); + if(ObjectUtils.isEmpty(parameter.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"))){ + parameter.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",parameter.get("WarnTime")); + } } else if(StringUtils.equals(flag,"1")){ - parameter.put("implement_time",parameter.get("WarnTime")); + if(ObjectUtils.isEmpty(parameter.get("implement_time"))){ + parameter.put("implement_time",parameter.get("WarnTime")); + } } // parameter.remove("WarnTime"); @@ -249,7 +253,9 @@ public class LawsWarnService { Date newCarModelDate = null; try { - newCarModelDate = DateUtils.parseDate((String) data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"), "yyyy-MM-dd"); + if(ObjectUtils.isNotEmpty(data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"))){ + newCarModelDate = DateUtils.parseDate((String) data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"), "yyyy-MM-dd"); + } } catch (ParseException e) { e.printStackTrace(); } @@ -269,7 +275,9 @@ public class LawsWarnService { }).map(PhasedImplementationDetailsEO::getImplementationDate).collect(Collectors.toList()); Date implementTime = null; try { - implementTime = DateUtils.parseDate((String) data.get("implement_time"), "yyyy-MM-dd"); + if(ObjectUtils.isNotEmpty(data.get("implement_time"))){ + implementTime = DateUtils.parseDate((String) data.get("implement_time"), "yyyy-MM-dd"); + } } catch (ParseException e) { e.printStackTrace(); }