From f6eede9bd7a2e92310c5e8538314fff8b1428d63 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 24 Mar 2022 22:26:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=AF=94=E8=BE=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 48 ++++++++++++++-----
 1 file changed, 35 insertions(+), 13 deletions(-)

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<BussDocumentLi
                 map.put("click", "true");
             }
             //单独处理发布日期和标准实施日期
-            if ("issue_time".equals(onlCgformField.getDbFieldName())
-                    || "implement_time".equals(onlCgformField.getDbFieldName())) {
+            if ("issue_time".equals(onlCgformField.getDbFieldName())) {
                 map.put("sort", "true");//列表排序标识
             }
+//            if ("issue_time".equals(onlCgformField.getDbFieldName())
+//                    || "implement_time".equals(onlCgformField.getDbFieldName())) {
+//                map.put("sort", "true");//列表排序标识
+//            }
             map.put("db_field_name", onlCgformField.getDbFieldName());//字段
             if (CutEnum.CN.getValue().equals(cut)) {
                 map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
@@ -950,15 +953,24 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
     public void addInfo(Map<String, Object> 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<BussDocumentLi
     public void updateInfo(Map<String, Object> 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"))) {