From 899a50fd284fcbd55ef38c98f9118b23d9f977c6 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 00:45:56 +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/OtaBaCxKsjjsmccsServiceImpl.java   | 13 ++++++++++---
 .../service/impl/OtaBaCxKsjxtmccsServiceImpl.java   |  6 +++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
index bf494f628..68e221205 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.exception.JeroBootException;
+import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.ota.entity.*;
 import com.jero.modules.ota.enums.OtaModuleEnum;
 import com.jero.modules.ota.enums.OtaTitleEnum;
@@ -60,6 +61,9 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
     @Autowired
     private ISysDictService sysDictService;
 
+    @Autowired
+    private IOSSFileService ossFileService;
+
     /**
      * 保存
      *
@@ -229,7 +233,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
         }
 
         List<OtaBaCxKsjjsmccs> oldList = getByOtaId(otaId);
-        List<OtaBaCxKsjjsmccs> mccsList = parseFile(upFile, otaId, cut);
+        List<OtaBaCxKsjjsmccs> mccsList = parseFile(upFile, attFile, otaId, cut);
         ComparisonUtil cu = new ComparisonUtil();
         List<OtaBaCxTxjl> reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, OtaTitleEnum.GNMC.getName(), oldList, mccsList, sysDictService);
         deleteByOtaId(otaId);
@@ -238,7 +242,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
 
     }
 
-    private List<OtaBaCxKsjjsmccs> parseFile(File upFile, String otaId, String cut) throws Exception {
+    private List<OtaBaCxKsjjsmccs> parseFile(File upFile, File attFile, String otaId, String cut) throws Exception {
         Date now = new Date();
         List<OtaBaCxKsjjsmccs> mccsList = new ArrayList<>();
         Workbook wb = ImportFileUtil.readExcel(upFile);
@@ -253,7 +257,10 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
                 //列表数据数量，在证明材料处结束
                 OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId);
                 if (ObjectUtils.isNotEmpty(otaBaCxList)) {
-                    otaBaCxList.setZxsjjsfj(str);
+                    cell = row.getCell(1);
+                    str = ImportFileUtil.getCellValue(cell, wb);
+                    String[] strs = str.split(",");
+                    otaBaCxList.setZxsjjsfj(ImportFileUtil.uploadFiles(attFile, strs, ossFileService));
                     otaBaCxListService.editById(otaBaCxList);
                 }
                 break;
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 79ab8c3c4..c66e097fc 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
@@ -269,10 +269,10 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl<OtaBaCxKsjxtmccsMap
                 cell = row.getCell(2);
                 mssc.setSjbgcs(ImportFileUtil.getCellValue(cell, wb));
                 cell = row.getCell(3);
-                mssc.setTpt(ImportFileUtil.getCellValue(cell, wb));
-                cell = row.getCell(4);
                 String[] strs = ImportFileUtil.getCellValue(cell, wb).split(",");
-                mssc.setKzqmc(ImportFileUtil.uploadFiles(attFile, strs, ossFileService));
+                mssc.setTpt(ImportFileUtil.uploadFiles(attFile, strs, ossFileService));
+                cell = row.getCell(4);
+                mssc.setKzqmc(ImportFileUtil.getCellValue(cell, wb));
                 cell = row.getCell(5);
                 mssc.setAqwzxdj(ImportFileUtil.getCellValue(cell, wb));
                 cell = row.getCell(6);