diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 693bb8c66..d9417ada6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -359,10 +359,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map) { try { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); - String implementTime = (String) map.get("implement_time"); String issueTime = (String) map.get("issue_time"); - Date implementTimeDate = df.parse(implementTime); Date issueTimeDate = df.parse(issueTime); - if (issueTimeDate.after(implementTimeDate)) { - throw new JeroBootException("发布日期不能大于标准实施日期"); + String implementTime = (String) map.get("implement_time");//在产车实施日期 + String newCarimplementTime = (String) map.get("xin1_che1_xing2_ren4_zheng4_shi2_jian1");//新车型实施日期 + if(StringUtils.isNotBlank(implementTime)){ + Date implementTimeDate = df.parse(implementTime); + if (issueTimeDate.after(implementTimeDate)) { + throw new JeroBootException("发布日期不能大于在产车实施日期"); + } } - } catch (ParseException e) { - throw new JeroBootException("新增失败"); + if(StringUtils.isNotBlank(newCarimplementTime)){ + Date newCarimplementTimeDate = df.parse(newCarimplementTime); + if (issueTimeDate.after(newCarimplementTimeDate)) { + throw new JeroBootException("发布日期不能大于新车型实施日期"); + } + } + } catch (Exception e) { + throw new JeroBootException(e.getMessage()); } if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) { map.put("replace_standard", map.get("replace_standard_id")); @@ -1324,15 +1336,25 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map) { try { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); - String implementTime = (String) map.get("implement_time"); String issueTime = (String) map.get("issue_time"); - Date implementTimeDate = df.parse(implementTime); Date issueTimeDate = df.parse(issueTime); - if (issueTimeDate.after(implementTimeDate)) { - throw new JeroBootException("发布日期不能大于标准实施日期"); + String implementTime = (String) map.get("implement_time");//在产车实施日期 + String newCarimplementTime = (String) map.get("xin1_che1_xing2_ren4_zheng4_shi2_jian1");//新车型实施日期 + if(StringUtils.isNotBlank(implementTime)){ + Date implementTimeDate = df.parse(implementTime); + if (issueTimeDate.after(implementTimeDate)) { + throw new JeroBootException("发布日期不能大于在产车实施日期"); + } } + if(StringUtils.isNotBlank(newCarimplementTime)){ + Date newCarimplementTimeDate = df.parse(newCarimplementTime); + if (issueTimeDate.after(newCarimplementTimeDate)) { + throw new JeroBootException("发布日期不能大于新车型实施日期"); + } + } + } catch (ParseException e) { - throw new JeroBootException("编辑失败"); + throw new JeroBootException(e.getMessage()); } String cut = (String) map.get("cut"); if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) {