From 07819b9395613de98ae7c71627a28148589355e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 5 Apr 2023 14:37:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/service/impl/OtaBaSjQtsjxxServiceImpl.java  | 13 +++++++++++--
 .../ota/service/impl/OtaBaSjSjmbclServiceImpl.java  | 10 +++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjQtsjxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjQtsjxxServiceImpl.java
index a7c9b88e2..a1eb73bc5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjQtsjxxServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjQtsjxxServiceImpl.java
@@ -156,10 +156,19 @@ public class OtaBaSjQtsjxxServiceImpl extends ServiceImpl<OtaBaSjQtsjxxMapper, O
             cell.setCellValue(qt.getRwmc());
             row = s.getRow(1);
             cell = row.getCell(1);
-            cell.setCellValue(sdf.format(qt.getSjfbsj()));
+            String ks = "";
+            if (ObjectUtils.isNotEmpty(qt.getSjfbsj())) {
+                ks = sdf.format(qt.getSjfbsj());
+            }
+            cell.setCellValue(ks);
             row = s.getRow(2);
             cell = row.getCell(1);
-            cell.setCellValue(sdf.format(qt.getSjjzsj()));
+            String js = "";
+            if (ObjectUtils.isNotEmpty(qt.getSjjzsj())) {
+                js = sdf.format(qt.getSjjzsj());
+            }
+            cell.setCellValue(js);
+            cell.setCellValue(ks);
             wb.write(new FileOutputStream(file));
             wb.close();
         }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
index ad56dc740..c9023e723 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
@@ -295,7 +295,15 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, O
             cell.setCellValue(cl.getZsl());
             row = s.getRow(1);
             cell = row.getCell(1);
-            cell.setCellValue(sdf.format(cl.getScrqks()) + " - " + sdf.format(cl.getScrqjs()));
+            String ks = "";
+            if (ObjectUtils.isNotEmpty(cl.getScrqks())) {
+                ks = sdf.format(cl.getScrqks());
+            }
+            String js = "";
+            if (ObjectUtils.isNotEmpty(cl.getScrqjs())) {
+                js = sdf.format(cl.getScrqjs());
+            }
+            cell.setCellValue(ks + " - " + js);
             row = s.getRow(2);
             cell = row.getCell(1);
             cell.setCellValue(cl.getVinList());