From 6b6bf0caacca4ce510a2c1f0130cc1942cac4d4d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 25 Mar 2022 00:47:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 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 75619f925..1c4d0d9ec 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
@@ -1022,6 +1022,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 if(fieldDateList.contains(key)){
                     if (ObjectUtils.isNotEmpty(value)) {
                         value = "str_to_date('" + value + "','%Y-%m-%d')";
+                    }else{
+                        value = null;
                     }
                     valuesBuilder.append("," + value);
                 }else {
@@ -3264,9 +3266,37 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         for (Map<String, String> stringStringMap : dataList) {
             Map<String, Object> mapResult = new HashMap<>();
             i++;
+            int countError = 0;   //记录失败数据数量
+            String errorMsg = "第" + i + "行：";
+            //判断发布日期,新车型实施日期,在产车实施日期
+
+//            try {
+//                String issueTime = (String) stringStringMap.get("issue_time");
+//                if(StringUtils.isNotBlank(issueTime)){
+//                    SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+//                    Date issueTimeDate = df.parse(issueTime);
+//                    String implementTime = (String) stringStringMap.get("implement_time");//在产车实施日期
+//                    String newCarimplementTime = (String) stringStringMap.get("xin1_che1_xing2_ren4_zheng4_shi2_jian1");//新车型实施日期
+//                    if(StringUtils.isNotBlank(implementTime)){
+//                        Date implementTimeDate = df.parse(implementTime);
+//                        if (issueTimeDate.after(implementTimeDate)) {
+//                            errorMsg += "发布日期不能大于在产车实施日期";
+//                            countError++;
+//                        }
+//                    }
+//                    if(StringUtils.isNotBlank(newCarimplementTime)){
+//                        Date newCarimplementTimeDate = df.parse(newCarimplementTime);
+//                        if (issueTimeDate.after(newCarimplementTimeDate)) {
+//                            errorMsg += "发布日期不能大于新车型实施日期";
+//                            countError++;
+//                        }
+//                    }
+//                }
+//            } catch (Exception e) {
+//                log.error("文档库导入失败导入");
+//            }
             for (Map.Entry<String, String> entry : stringStringMap.entrySet()) {
-                int countError = 0;   //记录失败数据数量
-                String errorMsg = "第" + i + "行：";
+
                 String key = entry.getKey();
                 if (key.contains("*")) {
                     key = key.replace("*", "");