From fe0bd7214ebb6defb709c1be6cd13c1a6aa824cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 28 Mar 2023 10:04:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OtaBaCxAqcsServiceImpl.java  |  62 ++-
 .../service/impl/OtaBaCxJbxxServiceImpl.java  |  76 +--
 .../impl/OtaBaCxJsfzbacsServiceImpl.java      | 513 +++++++++---------
 .../impl/OtaBaCxKsjxtmccsServiceImpl.java     |   3 +
 .../impl/OtaBaCxZxsjyqServiceImpl.java        |  98 ++--
 5 files changed, 381 insertions(+), 371 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java
index 1cdd57027..63696717d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java
@@ -239,45 +239,47 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl<OtaBaCxAqcsMapper, OtaBa
     @Override
     public void exportData(File file, File attFile, String otaId, String cut) throws Exception {
         OtaBaCxAqcs aqcs = getByOtaId(otaId);
-        Workbook wb = ImportFileUtil.readExcel(file);
-        Sheet s = wb.getSheetAt(0);
+        if (ObjectUtils.isNotEmpty(aqcs)) {
+            Workbook wb = ImportFileUtil.readExcel(file);
+            Sheet s = wb.getSheetAt(0);
 
-        Row row = s.getRow(2);
-        Cell cell = row.getCell(2);
-        cell.setCellValue(sysDictService.queryDictItemByValue("protection_mechanism", aqcs.getBhjz(), cut));
+            Row row = s.getRow(2);
+            Cell cell = row.getCell(2);
+            cell.setCellValue(sysDictService.queryDictItemByValue("protection_mechanism", aqcs.getBhjz(), cut));
 
-        row = s.getRow(3);
-        cell = row.getCell(2);
-        cell.setCellValue(sysDictService.queryDictItemByValue("fail_safe_mechanism", aqcs.getFsxjz(), cut));
+            row = s.getRow(3);
+            cell = row.getCell(2);
+            cell.setCellValue(sysDictService.queryDictItemByValue("fail_safe_mechanism", aqcs.getFsxjz(), cut));
 
-        row = s.getRow(4);
-        cell = row.getCell(2);
-        cell.setCellValue(sysDictService.queryDictItemByValue("upgrade_failure", aqcs.getSjsbcs(), cut));
+            row = s.getRow(4);
+            cell = row.getCell(2);
+            cell.setCellValue(sysDictService.queryDictItemByValue("upgrade_failure", aqcs.getSjsbcs(), cut));
 
-        row = s.getRow(5);
-        cell = row.getCell(2);
-        cell.setCellValue(sysDictService.queryDictItemByValue("Information_security_mechanism", aqcs.getXxaqjz(), cut));
+            row = s.getRow(5);
+            cell = row.getCell(2);
+            cell.setCellValue(sysDictService.queryDictItemByValue("Information_security_mechanism", aqcs.getXxaqjz(), cut));
 
-        row = s.getRow(2);
-        cell = row.getCell(3);
+            row = s.getRow(2);
+            cell = row.getCell(3);
 
-        StringBuilder sb = new StringBuilder();
-        String attStr = aqcs.getZmcl();
-        List<AttachmentEO> attList = JSONArray.parseArray(attStr, AttachmentEO.class);
-        if (ObjectUtils.isNotEmpty(attList)) {
-            for (AttachmentEO aeo : attList) {
-                List<OSSFile> ossFileList = ossFileService.getFileInfos(aeo.getId());
-                for (OSSFile ossFile : ossFileList) {
-                    String filePath = ossFile.getUrl();
-                    boolean b = CosBootUtil.doesObjectExist(filePath);
-                    if (b) {
-                        InputStream download = CosBootUtil.download(filePath);
-                        ImportFileUtil.writeToLocal(attFile.getCanonicalPath() + "/" + ossFile.getFileName(), download);
-                        sb.append(ossFile.getFileName()).append(",");
+            StringBuilder sb = new StringBuilder();
+            String attStr = aqcs.getZmcl();
+            List<AttachmentEO> attList = JSONArray.parseArray(attStr, AttachmentEO.class);
+            if (ObjectUtils.isNotEmpty(attList)) {
+                for (AttachmentEO aeo : attList) {
+                    List<OSSFile> ossFileList = ossFileService.getFileInfos(aeo.getId());
+                    for (OSSFile ossFile : ossFileList) {
+                        String filePath = ossFile.getUrl();
+                        boolean b = CosBootUtil.doesObjectExist(filePath);
+                        if (b) {
+                            InputStream download = CosBootUtil.download(filePath);
+                            ImportFileUtil.writeToLocal(attFile.getCanonicalPath() + "/" + ossFile.getFileName(), download);
+                            sb.append(ossFile.getFileName()).append(",");
+                        }
                     }
                 }
             }
+            cell.setCellValue(sb.toString());
         }
-        cell.setCellValue(sb.toString());
     }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
index 282f53525..34087c8b7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
@@ -239,45 +239,47 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
     @Override
     public void exportData(File file, String otaId, String cut) throws Exception {
         OtaBaCxJbxx jbxx = this.getByOtaId(otaId);
-        Workbook wb = ImportFileUtil.readExcel(file);
-        Sheet s = wb.getSheetAt(0);
+        if (ObjectUtils.isNotEmpty(jbxx)) {
+            Workbook wb = ImportFileUtil.readExcel(file);
+            Sheet s = wb.getSheetAt(0);
 
-        Row row = s.getRow(1);
-        Cell cell = row.getCell(1);
-        cell.setCellValue(jbxx.getQymc());
+            Row row = s.getRow(1);
+            Cell cell = row.getCell(1);
+            cell.setCellValue(jbxx.getQymc());
 
-        row = s.getRow(2);
-        cell = row.getCell(1);
-        cell.setCellValue(jbxx.getDjbh());
+            row = s.getRow(2);
+            cell = row.getCell(1);
+            cell.setCellValue(jbxx.getDjbh());
 
-        row = s.getRow(3);
-        cell = row.getCell(1);
-        cell.setCellValue(jbxx.getCplb());
-        row = s.getRow(4);
-        cell = row.getCell(1);
-        cell.setCellValue(jbxx.getGgpc());
-        row = s.getRow(5);
-        cell = row.getCell(1);
-        cell.setCellValue(jbxx.getCpsb());
-        row = s.getRow(6);
-        cell = row.getCell(1);
-        cell.setCellValue(jbxx.getCpmc());
-        row = s.getRow(7);
-        cell = row.getCell(1);
-        cell.setCellValue(jbxx.getCpxh());
-        row = s.getRow(8);
-        cell = row.getCell(1);
-        cell.setCellValue(jbxx.getDllx1());
-        row = s.getRow(9);
-        cell = row.getCell(1);
-        cell.setCellValue(jbxx.getDllx2());
-        row = s.getRow(10);
-        cell = row.getCell(1);
-        cell.setCellValue(sysDictService.queryDictItemByValue("communication_terminal", jbxx.getTxzd(), cut));
-        row = s.getRow(11);
-        cell = row.getCell(1);
-        cell.setCellValue(jbxx.getCdotasj());
-        wb.write(new FileOutputStream(file));
-        wb.close();
+            row = s.getRow(3);
+            cell = row.getCell(1);
+            cell.setCellValue(jbxx.getCplb());
+            row = s.getRow(4);
+            cell = row.getCell(1);
+            cell.setCellValue(jbxx.getGgpc());
+            row = s.getRow(5);
+            cell = row.getCell(1);
+            cell.setCellValue(jbxx.getCpsb());
+            row = s.getRow(6);
+            cell = row.getCell(1);
+            cell.setCellValue(jbxx.getCpmc());
+            row = s.getRow(7);
+            cell = row.getCell(1);
+            cell.setCellValue(jbxx.getCpxh());
+            row = s.getRow(8);
+            cell = row.getCell(1);
+            cell.setCellValue(jbxx.getDllx1());
+            row = s.getRow(9);
+            cell = row.getCell(1);
+            cell.setCellValue(jbxx.getDllx2());
+            row = s.getRow(10);
+            cell = row.getCell(1);
+            cell.setCellValue(sysDictService.queryDictItemByValue("communication_terminal", jbxx.getTxzd(), cut));
+            row = s.getRow(11);
+            cell = row.getCell(1);
+            cell.setCellValue(jbxx.getCdotasj());
+            wb.write(new FileOutputStream(file));
+            wb.close();
+        }
     }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
index f1dbcf952..5547b5e92 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
@@ -583,282 +583,283 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
     @Override
     public void exportData(File file, String otaId, String cut) throws Exception {
         OtaBaCxJsfzbacs bass = getByOtaId(otaId);
-        Workbook wb = ImportFileUtil.readExcel(file);
-        Sheet s = wb.getSheetAt(0);
-        bass.setOtaId(otaId);
+        if (ObjectUtils.isNotEmpty(bass)) {
+            Workbook wb = ImportFileUtil.readExcel(file);
+            Sheet s = wb.getSheetAt(0);
+            bass.setOtaId(otaId);
 
-        Row row = s.getRow(2);
-        Cell cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsfzczjPz()));
-        row = s.getRow(2);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJgldSl());
-        row = s.getRow(3);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJgldBzwz());
-        row = s.getRow(4);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJgldGgxh());
-        row = s.getRow(5);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJgldScqy());
+            Row row = s.getRow(2);
+            Cell cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsfzczjPz()));
+            row = s.getRow(2);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJgldSl());
+            row = s.getRow(3);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJgldBzwz());
+            row = s.getRow(4);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJgldGgxh());
+            row = s.getRow(5);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJgldScqy());
 
-        row = s.getRow(6);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getHmbldPz()));
-        row = s.getRow(6);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getHmbldSl());
-        row = s.getRow(7);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getHmbldBzwz());
-        row = s.getRow(8);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getHmbldGgxh());
-        row = s.getRow(9);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getHmbldScqy());
-        row = s.getRow(10);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getCsbldPz()));
-        row = s.getRow(10);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getCsbldSl());
-        row = s.getRow(11);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getCsbldBzwz());
-        row = s.getRow(12);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getCsbldGgxh());
-        row = s.getRow(13);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getCsbldScqy());
+            row = s.getRow(6);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getHmbldPz()));
+            row = s.getRow(6);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getHmbldSl());
+            row = s.getRow(7);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getHmbldBzwz());
+            row = s.getRow(8);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getHmbldGgxh());
+            row = s.getRow(9);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getHmbldScqy());
+            row = s.getRow(10);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getCsbldPz()));
+            row = s.getRow(10);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getCsbldSl());
+            row = s.getRow(11);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getCsbldBzwz());
+            row = s.getRow(12);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getCsbldGgxh());
+            row = s.getRow(13);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getCsbldScqy());
 
-        row = s.getRow(14);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getSxthsPz()));
-        row = s.getRow(14);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getSxthsSl());
-        row = s.getRow(15);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getSxthsBzwz());
-        row = s.getRow(16);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getSxthsGgxh());
-        row = s.getRow(17);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getSxthsScqy());
+            row = s.getRow(14);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getSxthsPz()));
+            row = s.getRow(14);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getSxthsSl());
+            row = s.getRow(15);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getSxthsBzwz());
+            row = s.getRow(16);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getSxthsGgxh());
+            row = s.getRow(17);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getSxthsScqy());
 
-        row = s.getRow(18);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getSxtdsdPz()));
-        row = s.getRow(18);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getSxtdsdSl());
-        row = s.getRow(19);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getSxtdsdBzwz());
-        row = s.getRow(20);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getSxtdsdGgxh());
-        row = s.getRow(21);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getSxtdsdScqy());
+            row = s.getRow(18);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getSxtdsdPz()));
+            row = s.getRow(18);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getSxtdsdSl());
+            row = s.getRow(19);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getSxtdsdBzwz());
+            row = s.getRow(20);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getSxtdsdGgxh());
+            row = s.getRow(21);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getSxtdsdScqy());
 
-        row = s.getRow(22);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsyjkPz()));
-        row = s.getRow(22);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsyjkSl());
-        row = s.getRow(23);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsyjkBzwz());
-        row = s.getRow(24);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsyjkGgxh());
-        row = s.getRow(25);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsyjkScqy());
+            row = s.getRow(22);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsyjkPz()));
+            row = s.getRow(22);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsyjkSl());
+            row = s.getRow(23);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsyjkBzwz());
+            row = s.getRow(24);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsyjkGgxh());
+            row = s.getRow(25);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsyjkScqy());
 
-        row = s.getRow(26);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsyhwPz()));
-        row = s.getRow(26);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsyhwSl());
-        row = s.getRow(27);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsyhwBzwz());
-        row = s.getRow(28);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsyhwGgxh());
-        row = s.getRow(29);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsyhwScqy());
+            row = s.getRow(26);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsyhwPz()));
+            row = s.getRow(26);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsyhwSl());
+            row = s.getRow(27);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsyhwBzwz());
+            row = s.getRow(28);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsyhwGgxh());
+            row = s.getRow(29);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsyhwScqy());
 
-        row = s.getRow(30);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getCzwxdwPz()));
-        row = s.getRow(30);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getCzwxdwGgxh());
-        row = s.getRow(31);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getCzwxdwScqy());
+            row = s.getRow(30);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getCzwxdwPz()));
+            row = s.getRow(30);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getCzwxdwGgxh());
+            row = s.getRow(31);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getCzwxdwScqy());
 
-        row = s.getRow(32);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getGxdhPz()));
-        row = s.getRow(32);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getGxdhGgxh());
-        row = s.getRow(33);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getGxdhScqy());
+            row = s.getRow(32);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getGxdhPz()));
+            row = s.getRow(32);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getGxdhGgxh());
+            row = s.getRow(33);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getGxdhScqy());
 
-        row = s.getRow(34);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getLsjPz()));
-        row = s.getRow(34);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getLsjGgxh());
-        row = s.getRow(35);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getLsjScqy());
+            row = s.getRow(34);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getLsjPz()));
+            row = s.getRow(34);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getLsjGgxh());
+            row = s.getRow(35);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getLsjScqy());
 
-        row = s.getRow(36);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getGjddtPz()));
-        row = s.getRow(36);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getGjddtGgxh());
-        row = s.getRow(37);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getGjddtScqy());
+            row = s.getRow(36);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getGjddtPz()));
+            row = s.getRow(36);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getGjddtGgxh());
+            row = s.getRow(37);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getGjddtScqy());
 
-        row = s.getRow(38);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getDzwlPz()));
-        row = s.getRow(38);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getDzwlDxxgcs());
+            row = s.getRow(38);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getDzwlPz()));
+            row = s.getRow(38);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getDzwlDxxgcs());
 
-        row = s.getRow(39);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getCztxPz()));
-        row = s.getRow(39);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getCztxXtmc());
-        row = s.getRow(40);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getCztxGgxh());
-        row = s.getRow(41);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getCztxScqy());
-        row = s.getRow(42);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getCztxBbh());
-        row = s.getRow(43);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getCztxKfqy());
+            row = s.getRow(39);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getCztxPz()));
+            row = s.getRow(39);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getCztxXtmc());
+            row = s.getRow(40);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getCztxGgxh());
+            row = s.getRow(41);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getCztxScqy());
+            row = s.getRow(42);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getCztxBbh());
+            row = s.getRow(43);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getCztxKfqy());
 
-        row = s.getRow(44);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsfzczjPz()));
-        row = s.getRow(44);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsfzczjMc());
-        row = s.getRow(45);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsfzczjYjxh());
-        row = s.getRow(46);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsfzczjScqy());
+            row = s.getRow(44);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsfzczjPz()));
+            row = s.getRow(44);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsfzczjMc());
+            row = s.getRow(45);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsfzczjYjxh());
+            row = s.getRow(46);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsfzczjScqy());
 
-        row = s.getRow(47);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsfzzsqPz()));
-        row = s.getRow(47);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsfzzsqMc());
-        row = s.getRow(48);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsfzzsqYjxh());
-        row = s.getRow(49);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsfzzsqScqy());
+            row = s.getRow(47);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsfzzsqPz()));
+            row = s.getRow(47);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsfzzsqMc());
+            row = s.getRow(48);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsfzzsqYjxh());
+            row = s.getRow(49);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsfzzsqScqy());
 
-        row = s.getRow(50);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getFxptstsPz()));
-        row = s.getRow(50);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getFxptstsMc());
-        row = s.getRow(51);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getFxptstsYjxh());
-        row = s.getRow(52);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getFxptstsScqy());
+            row = s.getRow(50);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getFxptstsPz()));
+            row = s.getRow(50);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getFxptstsMc());
+            row = s.getRow(51);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getFxptstsYjxh());
+            row = s.getRow(52);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getFxptstsScqy());
 
-        row = s.getRow(53);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsyzyltsPz()));
-        row = s.getRow(53);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsyzyltsMc());
-        row = s.getRow(54);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsyzyltsYjxh());
-        row = s.getRow(55);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getJsyzyltsScqy());
+            row = s.getRow(53);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsyzyltsPz()));
+            row = s.getRow(53);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsyzyltsMc());
+            row = s.getRow(54);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsyzyltsYjxh());
+            row = s.getRow(55);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getJsyzyltsScqy());
 
-        row = s.getRow(56);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getDssadPz()));
-        row = s.getRow(56);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getDssadGgxh());
-        row = s.getRow(57);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getDssadScqy());
+            row = s.getRow(56);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getDssadPz()));
+            row = s.getRow(56);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getDssadGgxh());
+            row = s.getRow(57);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getDssadScqy());
 
-        row = s.getRow(58);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getEdrPz()));
-        row = s.getRow(58);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getEdrGgxh());
-        row = s.getRow(59);
-        cell = row.getCell(4);
-        cell.setCellValue(bass.getEdrScqy());
+            row = s.getRow(58);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getEdrPz()));
+            row = s.getRow(58);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getEdrGgxh());
+            row = s.getRow(59);
+            cell = row.getCell(4);
+            cell.setCellValue(bass.getEdrScqy());
 
 
-        List<OtaBaCxSjmk> sjmkList = OtaBaCxSjmkService.queryByOtaId(otaId);
-        int startRow = 63;
-        for (OtaBaCxSjmk sjmk : sjmkList) {
-            row = s.getRow(startRow);
-            cell = row.createCell(0);
-            cell.setCellValue(sjmk.getBjmc());
-            cell = row.createCell(1);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(sjmk.getPzqk()));
-            cell = row.createCell(2);
-            cell.setCellValue(sjmk.getKzqmc());
-            cell = row.createCell(3);
-            cell.setCellValue(sjmk.getYjggxh());
-            cell = row.createCell(4);
-            cell.setCellValue(sjmk.getYjscqy());
-            cell = row.createCell(5);
-            cell.setCellValue(sjmk.getRjbb());
-            cell = row.createCell(6);
-            cell.setCellValue(sjmk.getRjkfqy());
-            cell = row.createCell(7);
-            cell.setCellValue(sjmk.getBzwz());
-            startRow++;
+            List<OtaBaCxSjmk> sjmkList = OtaBaCxSjmkService.queryByOtaId(otaId);
+            int startRow = 63;
+            for (OtaBaCxSjmk sjmk : sjmkList) {
+                row = s.getRow(startRow);
+                cell = row.createCell(0);
+                cell.setCellValue(sjmk.getBjmc());
+                cell = row.createCell(1);
+                cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(sjmk.getPzqk()));
+                cell = row.createCell(2);
+                cell.setCellValue(sjmk.getKzqmc());
+                cell = row.createCell(3);
+                cell.setCellValue(sjmk.getYjggxh());
+                cell = row.createCell(4);
+                cell.setCellValue(sjmk.getYjscqy());
+                cell = row.createCell(5);
+                cell.setCellValue(sjmk.getRjbb());
+                cell = row.createCell(6);
+                cell.setCellValue(sjmk.getRjkfqy());
+                cell = row.createCell(7);
+                cell.setCellValue(sjmk.getBzwz());
+                startRow++;
+            }
         }
-
     }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
index f4f3d2c04..843ec4da0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
@@ -365,6 +365,9 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl<OtaBaCxKsjxtmccsMap
             startRow++;
         }
         Row row = s.getRow(startRow);
+        if(null == row){
+            row = s.createRow(startRow);
+        }
         Cell cell = row.createCell(0);
         cell.setCellValue("证明材料");
         cell = row.getCell(1);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java
index 1fcbbaf32..32d24f4a3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java
@@ -258,58 +258,60 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl<OtaBaCxZxsjyqMapper, O
     @Override
     public void exportData(File file, File attFile, String otaId, String cut) throws Exception {
         OtaBaCxZxsjyq otaBaCxZxsjyq = this.getByOtaId(otaId);
-        Workbook wb = ImportFileUtil.readExcel(file);
-        Sheet s = wb.getSheetAt(0);
-        Row row = s.getRow(2);
-        Cell cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getBhsjb()));
-        row = s.getRow(3);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getBhclbb()));
-        row = s.getRow(4);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getClgxnl()));
-        row = s.getRow(5);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getClsjtj()));
-        row = s.getRow(6);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getClsjdl()));
-        row = s.getRow(7);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getSjbhaq()));
-        row = s.getRow(8);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getSjantj()));
-        row = s.getRow(9);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getSjsbaq()));
-        row = s.getRow(10);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getSjgg()));
-        row = s.getRow(11);
-        cell = row.getCell(2);
-        cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getSjzt()));
+        if (ObjectUtils.isNotEmpty(otaBaCxZxsjyq)) {
+            Workbook wb = ImportFileUtil.readExcel(file);
+            Sheet s = wb.getSheetAt(0);
+            Row row = s.getRow(2);
+            Cell cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getBhsjb()));
+            row = s.getRow(3);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getBhclbb()));
+            row = s.getRow(4);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getClgxnl()));
+            row = s.getRow(5);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getClsjtj()));
+            row = s.getRow(6);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getClsjdl()));
+            row = s.getRow(7);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getSjbhaq()));
+            row = s.getRow(8);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getSjantj()));
+            row = s.getRow(9);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getSjsbaq()));
+            row = s.getRow(10);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getSjgg()));
+            row = s.getRow(11);
+            cell = row.getCell(2);
+            cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(otaBaCxZxsjyq.getSjzt()));
 
-        row = s.getRow(2);
-        cell = row.getCell(3);
-        StringBuilder sb = new StringBuilder();
-        String attStr = otaBaCxZxsjyq.getZmcl();
-        List<AttachmentEO> attList = JSONArray.parseArray(attStr, AttachmentEO.class);
-        if (ObjectUtils.isNotEmpty(attList)) {
-            for (AttachmentEO aeo : attList) {
-                List<OSSFile> ossFileList = ossFileService.getFileInfos(aeo.getId());
-                for (OSSFile ossFile : ossFileList) {
-                    String filePath = ossFile.getUrl();
-                    boolean b = CosBootUtil.doesObjectExist(filePath);
-                    if (b) {
-                        InputStream download = CosBootUtil.download(filePath);
-                        ImportFileUtil.writeToLocal(attFile.getCanonicalPath() + "/" + ossFile.getFileName(), download);
-                        sb.append(ossFile.getFileName()).append(",");
+            row = s.getRow(2);
+            cell = row.getCell(3);
+            StringBuilder sb = new StringBuilder();
+            String attStr = otaBaCxZxsjyq.getZmcl();
+            List<AttachmentEO> attList = JSONArray.parseArray(attStr, AttachmentEO.class);
+            if (ObjectUtils.isNotEmpty(attList)) {
+                for (AttachmentEO aeo : attList) {
+                    List<OSSFile> ossFileList = ossFileService.getFileInfos(aeo.getId());
+                    for (OSSFile ossFile : ossFileList) {
+                        String filePath = ossFile.getUrl();
+                        boolean b = CosBootUtil.doesObjectExist(filePath);
+                        if (b) {
+                            InputStream download = CosBootUtil.download(filePath);
+                            ImportFileUtil.writeToLocal(attFile.getCanonicalPath() + "/" + ossFile.getFileName(), download);
+                            sb.append(ossFile.getFileName()).append(",");
+                        }
                     }
                 }
             }
+            cell.setCellValue(sb.toString());
         }
-        cell.setCellValue(sb.toString());
     }
 }