From 6867495e4d420363ef14384d43900a279cf3beeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 17 May 2023 17:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OtaBaSjSjxtbhServiceImpl.java        | 31 +++++++++++++++++--
 .../components/upgradeimpactassessment.vue    |  2 +-
 .../components/upgradetargetmodel.vue         |  2 +-
 .../components/basicInformation.vue           |  2 +-
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
index c337efadd..52b8714bc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
@@ -362,9 +362,33 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
 
     @Override
     public void exportData(File file, String otaId, String cut) throws Exception {
+        Workbook wb = ImportFileUtil.readExcel(file);
+        //系统中维护的系统功能与电子控制器维护关系表
+        List<OtaBaSjGnxtwh> whList = otaBaSjGnxtwhService.list();
+        if (ObjectUtils.isNotEmpty(whList)) {
+            Sheet s1 = wb.getSheetAt(1);
+            CellStyle style = wb.createCellStyle();
+            style.setBorderTop(BorderStyle.THIN);
+            style.setBorderBottom(BorderStyle.THIN);
+            style.setBorderLeft(BorderStyle.THIN);
+            style.setBorderRight(BorderStyle.THIN);
+            Row row1;
+            Cell cell1;
+            int start1 = 1;
+            for (OtaBaSjGnxtwh wh : whList) {
+                row1 = s1.createRow(start1);
+                cell1 = row1.createCell(0);
+                cell1.setCellStyle(style);
+                cell1.setCellValue(wh.getGnxt());
+                cell1 = row1.createCell(1);
+                cell1.setCellStyle(style);
+                cell1.setCellValue(wh.getDykzq());
+                start1++;
+            }
+        }
+        //本次升级的系统名称与参数变化
         List<OtaBaSjSjxtbh> bhList = this.getByOtaId(otaId);
         if (ObjectUtils.isNotEmpty(bhList)) {
-            Workbook wb = ImportFileUtil.readExcel(file);
             Sheet s = wb.getSheetAt(0);
             CellStyle style = wb.createCellStyle();
             style.setBorderTop(BorderStyle.THIN);
@@ -414,8 +438,9 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
                 cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(bh.getSfcfsj()));
                 start++;
             }
-            wb.write(new FileOutputStream(file));
-            wb.close();
         }
+
+        wb.write(new FileOutputStream(file));
+        wb.close();
     }
 }
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
index 2c34ae316..1bd0f1aab 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
@@ -344,7 +344,7 @@ this.$forceUpdate()
     },
     // 模板下载
     handleModule() {
-      downloadFile('ota/otaBaSjSjyxpg/exportTemplate', '升级影响评估' + '.zip', {})
+      downloadFile('ota/otaBaSjSjyxpg/exportTemplate', '升级活动备案-升级影响评估' + '.zip', {})
     },
     clickButtonToUpload(item) {
       this.$refs.uploadFile.perentHandleFunc()
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
index 834913b6c..0e8268fb1 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -216,7 +216,7 @@ export default {
   methods: {
     // 模板下载
     handleModule() {
-      downloadFile('ota/otaBaSjSjmbcx/exportTemplate', '升级目标车型' + '.zip', {})
+      downloadFile('ota/otaBaSjSjmbcx/exportTemplate', '升级活动备案-升级目标车型' + '.zip', {})
     },
     getData(item) {
       let otaIdT = localStorage.getItem('otaIdT')
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
index f9cff0d45..77a4e69c8 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
@@ -304,7 +304,7 @@ export default {
     },
     // 模板下载
     handleModule() {
-      downloadFile('ota/otaBaCxJbxx/exportTemplate', '车型基本信息' + '.zip', {})
+      downloadFile('ota/otaBaCxJbxx/exportTemplate', '车型及功能备案-车型基本信息' + '.zip', {})
     },
     getSelect(){
       getAction('/ota/otaBaCxList/list').then(res=>{