From 2b405230a4fa015f37257a1d316bf818f29c18ad Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 19 Oct 2023 10:40:09 +0800
Subject: [PATCH] =?UTF-8?q?OTA=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OtaManageApplyEOServiceImpl.java      | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index 7fcc03374..590be3ac0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -11,12 +11,20 @@ import com.jero.common.util.oConvertUtils;
 import com.jero.modules.dummy.enums.OrderEnum;
 import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.feishu.service.IFeishuService;
-import com.jero.modules.ota.entity.*;
+import com.jero.modules.ota.entity.OtaManageApplyEO;
+import com.jero.modules.ota.entity.OtaManageHistory;
+import com.jero.modules.ota.entity.OtaManagePermission;
+import com.jero.modules.ota.entity.OtaManageReceive;
+import com.jero.modules.ota.entity.OtaManageReceiveNsdp;
 import com.jero.modules.ota.enums.OtaCarEnum;
 import com.jero.modules.ota.enums.OtaHomoImpactEnum;
 import com.jero.modules.ota.enums.OtaStatusEnum;
 import com.jero.modules.ota.mapper.OtaManageApplyEOMapper;
-import com.jero.modules.ota.service.*;
+import com.jero.modules.ota.service.IOtaManageApplyEOService;
+import com.jero.modules.ota.service.IOtaManageHistoryService;
+import com.jero.modules.ota.service.IOtaManagePermissionService;
+import com.jero.modules.ota.service.IOtaManageReceiveNsdpService;
+import com.jero.modules.ota.service.IOtaManageReceiveService;
 import com.jero.modules.ota.vo.AllCarExportCnVO;
 import com.jero.modules.ota.vo.AllCarExportEnVO;
 import com.jero.modules.ota.vo.OneCarExportCnVO;
@@ -57,7 +65,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.Collator;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -119,8 +126,6 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
     @Value(value = "${jero.backUrlPhone}")
     private String backUrlPhone;
 
-    private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-    private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
 
     /**
      * 保存
@@ -197,6 +202,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 
 
     public List<OtaManageApplyEO> getNsdpList(OtaManageApplyEO otaManageApplyEO) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Date today = new Date();
         List<OtaManageApplyEO> resList = new ArrayList<>();
         List<OtaManageReceiveNsdp> dataList = otaManageReceiveNsdpService.queryList();
@@ -226,7 +232,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                                 }
                             }
                         }
-                    } catch (ParseException e) {
+                    } catch (Exception e) {
                         e.printStackTrace();
                     }
                     String appliedVehicleProject = omrn.getVehicle();