Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

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());
     }
 }

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();
+        }
     }
 }

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++;
+            }
         }
-
     }
 }

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);

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());
     }
 }

jero-web/src/common/lang/en-us.js

@@ -1717,10 +1717,14 @@ module.exports = {
   complianceReporting:'Compliance Reporting',
   youCanOnlySelectStatusClearSubmit:'You can only select data with a process status of Clear to Submit',
   note:'Note: The attachment includes the list of test items and test report. Test standard or technical specification',
+  notecsv:'Note: CSV format is supported. The value is within 20M',
   format:'It supports doc/docx/pdf format and is less than 50M in size',
   cantTransferToYourself:"Can't transfer to yourself",
   theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate',
   dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset',
   reasonForReturnOfDesignCompliance:'Reason for return of design compliance',
   noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10',
+  notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n',
+  notethree:'Provide supporting materials',
+  verifyComplianceConfirmReturnReason:'Verify compliance Confirm return reason',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1821,8 +1821,12 @@ module.exports = {
   note:'注:附件包括测试项目清单、测试报告．测试标准或技术规范',
   format:'支持doc/docx/pdf格式,大小50M以内',
   cantTransferToYourself:"不能转办给自己",
-  noteone:'注:支持CSV格式，大小20M以内，数量1-10个',
+  noteone:'注:支持CSV格式，大小20M以内，数量1-20个',
+  notecsv:'注:支持CSV格式，大小20M以内',
   theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起',
   dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置',
-  reasonForReturnOfDesignCompliance:'设计符合性退回原因',
+  reasonForReturnOfDesignCompliance:'设计符合性确认退回原因',
+  notetwo:'\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n',
+  notethree:'\n提供证明材料\n',
+  verifyComplianceConfirmReturnReason:'验证符合性确认退回原因',
 }

jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue

@@ -66,6 +66,7 @@
                     formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
+                  <p>{{$t('notecsv')}}</p>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -123,6 +124,7 @@
                         formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                         }}
                       </a-button>
+                      <p style='width: 243px'>{{$t('format')}}</p>
                     </a-form-model-item>
                   </div>
                 </a-col>
@@ -151,11 +153,12 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="VINcodelist">
                   <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('VINcodelist')">
+                            @click="clickButtonToUpload('VINcodelist1')">
                     {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||
                     formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
+                  <p>{{$t('format')}}</p>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -167,7 +170,7 @@
         <a-button type="primary" @click="handleSubmit" :loading="confirmLoading">{{$t('submit')}}</a-button>
       </div>
     </a-drawer>
-    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+    <uploadFile ref="uploadFile" :acceptcode="acceptcode" @uploadSuccess="uploadSuccess"/>
   </div>
 
 </template>
@@ -189,6 +192,7 @@ export default {
       disabled: false,
       formInline: {},
       confirmLoading: false,
+      acceptcode:'',
       projectNameList: [],
       DeliverableTreeList: [],
       rules: {
@@ -302,6 +306,11 @@ export default {
       })
     },
     clickButtonToUpload(item) {
+      if(item == 'VINcodelist'){
+        this.acceptcode = 'csv'
+      }else {
+        this.acceptcode = 'doc,docx,pdf'
+      }
       this.$refs.uploadFile.perentHandleFunc()
       this.$refs.uploadFile.visible = true
       this.uploadName = item

jero-web/src/views/otamanagement/upgradeactivity/index.vue

@@ -288,7 +288,7 @@ export default {
           align: 'left',
           ellipsis: true,
           width: 170,
-          dataIndex: 'cjsj'
+          dataIndex: 'createTime'
         },
         {
           title: this.$t('remarks'),
@@ -450,6 +450,7 @@ export default {
     // 维护
     maintenanceClick(row){
       this.$refs.maintenanceRef.edit(row)
+      console.log(row);
     },
     // 数据维护
     maintenanceallClick(){

jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue

@@ -53,7 +53,11 @@
       </span>
     </a-table>
     <div>
-      <a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+      <a-button type="primary" @click="clickButtonToUpload(fileList)">
+        {{ (fileList === 'null' || fileList === '' ||
+        fileList == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
+        }}
+      </a-button>
       <div style='margin-top: 20px'>
         <p>{{$t('note')}}</p>
         <p>&nbsp;&nbsp;&nbsp;&nbsp;{{$t('format')}}</p>
@@ -64,7 +68,7 @@
       <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
       <a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
     </div>
-    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
+    <uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
 </template>
 
@@ -86,6 +90,7 @@ export default {
 
         }
       ],
+      fileList:'',
       loading: false,
       disable:false,
       columns: [
@@ -216,14 +221,39 @@ export default {
         }
         getAction('/ota/otaBaSjSjfzbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
           this.dataSource =res.result.list == null ?  {} : res.result.list
+          this.fileList = res.result.fj
         })
     },
     save(){
-      postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{
+      postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource,fj:this.fileList}).then(res=>{
           console.log(res);
           this.$message.success(this.$t('SavedSuccessfully'))
         })
     },
+    uploadSuccess(data) {
+      let attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push(item.id || data.name)
+        })
+      }
+      this.$forceUpdate()
+      // /** 赋值给当前对应的表单文件 */
+      this.fileList = attIdList.join(',')
+      // this.fileList.certifyingmaterials = this.$t('viewFile')
+    },
+    clickButtonToUpload(current) {
+      this.$refs.uploadFile.perentHandleFunc()
+      this.$refs.uploadFile.visible = true
+      this.uploadName = current
+      getAction('sys/common/getFileInfos', { id: current }).then((res) => {
+        if (res.success) {
+          this.$refs.uploadFile.perentHandleFunc(res.result)
+        } else {
+          this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
     last(){
       this.save()
       this.$emit('beupgradedonlineup')
@@ -239,20 +269,6 @@ export default {
       deleteData(record){
         this.dataSource.splice(this.dataSource.indexOf(record),1)
       },
-    uploadSuccess(data) {
-      let attIdList = []
-      if (data && data.length > 0) {
-        data.map(item => {
-          attIdList.push({
-            id:item.id,
-            fileName:item.fileName
-          })
-        })
-      }
-      /** 赋值给当前对应的表单文件 */
-      this.fileList.uploadName = attIdList
-      this.fileList.certifyingmaterials = this.$t('viewFile')
-    },
   }
 }
 </script>

jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue

@@ -72,15 +72,15 @@
                 <!--              <span class="Required">*</span>-->
                 <span class="title-text-text"></span>
               </div>
-                            <a-form-model-item class="itemModel" prop="VINcodelist">
+                            <a-form-model-item class="itemModel" prop="csv">
                               <a-button type="primary" class="button-text"
-                                        @click="clickButtonToUpload('VINcodelist')">
-                                {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||
-                                formInline.VINcodelist == null) ? $t('VINcodeupload') : $t('viewUploadedFiles')
+                                        @click="clickButtonToUpload('csv')">
+                                {{ (formInline.csv === 'null' || formInline.csv === '' ||
+                                formInline.csv == null) ? $t('VINcodeupload') : $t('viewUploadedFiles')
                                 }}
                               </a-button>
                               <p>{{$t('noteone')}}</p>
-                              <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
+                              <uploadFile ref="uploadFile" :acceptcode="'csv'" @uploadSuccess="uploadSuccess"></uploadFile>
                             </a-form-model-item>
             </div>
           </a-col>
@@ -139,6 +139,7 @@ export default {
           if(res.code==200){
             this.formInline.zsl=res.result.zsl
             this.formInline.vinList=res.result.vinList
+            this.formInline.csv=res.result.csv
             this.formInline.dateofproduction=[]
             this.formInline.dateofproduction.push(res.result.scrqks)
             this.formInline.dateofproduction.push(res.result.scrqjs)
@@ -152,6 +153,7 @@ export default {
       let obj={}
       obj.otaId=localStorage.getItem('otaId')
       obj.zsl = this.formInline.zsl
+      obj.csv = this.formInline.csv
       if(this.formInline.dateofproduction){
         obj.scrqks = this.formInline.dateofproduction[0]
         obj.scrqjs = this.formInline.dateofproduction[1]
@@ -188,6 +190,25 @@ export default {
         }
       })
     },
+    /** 上传文件的回调 */
+    uploadSuccess(data) {
+      // console.log(data)
+      let attIdList = []
+      if(data && data.length>0){
+        data.map(item => {
+          attIdList.push(item.id || data.name)
+        })
+        /** 赋值给当前对应的表单文件 */
+        this.formInline.csv = attIdList.join(',')
+        this.formInline = { ...this.formInline }
+        // console.log('form',this.formInline)
+      }else{
+        this.formInline.csv = ''
+        this.formInline = { ...this.formInline }
+        // console.log('form',this.formInline)
+
+      }
+    },
   }
 }
 </script>

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue

@@ -62,8 +62,10 @@
             </a-radio-group>
           </span>
         </a-layout-content>
-        <a-layout-content style='border: black solid 1px;border-left: none;border-bottom: none;max-width: 522px'>
-          <a-button style='margin-top: 20%;margin-left: 10%;' @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+        <a-layout-content style='border: black solid 1px;border-left: none;border-bottom: none;max-width: 428px'>
+          <a-button style='margin-top: 15%;margin-left: 10%;' @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+          <span class="spanone">{{$t('notetwo')}}</span>
+          <span class="spanone">{{$t('format')}}</span>
         </a-layout-content>
       </a-layout>
       <div class='box-layout'>
@@ -110,7 +112,7 @@
             </a-radio-group>
           </span>
           <span class='box-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.yhqr"> 
+            <a-radio-group style='margin-left: 40px;' v-model="form.yhqr">
                     <a-radio :value="1"> {{ $t('yes') }} </a-radio>
                     <a-radio :value="2"> {{ $t('not') }} </a-radio>
             </a-radio-group>
@@ -133,7 +135,9 @@
           </span>
         </div>
         <div class='layout-box-three'>
-          <a-button style='margin-top: 20%;margin-left: 10%;' @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+          <a-button style='margin-top: 15%;margin-left: 10%;' @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+          <span class="spanone">{{$t('notethree')}}</span>
+          <span class="spanone">{{$t('format')}}</span>
         </div>
       </div>
     </a-layout>
@@ -142,7 +146,7 @@
       <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
       <a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
     </div>
-    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
+    <uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
 </template>
 
@@ -327,7 +331,7 @@ this.$forceUpdate()
       this.$refs.uploadFile.perentHandleFunc()
       this.$refs.uploadFile.visible = true
       this.uploadName = item
-      getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+      getAction('sys/common/getFileInfos', { id: this.form[item] }).then((res) => {
         if (res.success) {
           this.$refs.uploadFile.perentHandleFunc(res.result)
         } else {
@@ -335,33 +339,22 @@ this.$forceUpdate()
         }
       })
     },
-    getList() {
-      let queryParam = JSON.parse(JSON.stringify(this.queryParam))
-      Object.keys(queryParam).forEach(val => {
-        if (queryParam[val] instanceof Array) {
-          queryParam[val] = queryParam[val].join(',')
-        }
-      })
-      let query = {
-        pageNo: this.pageNo,
-        pageSize: this.pageSize,
-        ...queryParam
+    uploadSuccess(data) {
+      let attIdList = []
+      if(data && data.length>0){
+        data.map(item => {
+          attIdList.push(item.id || data.name)
+        })
+        /** 赋值给当前对应的表单文件 */
+        this.form[this.uploadName] = attIdList.join(',')
+        this.form = { ...this.form }
+        // console.log('form',this.formInline)
+      }else{
+        this.form[this.uploadName] = ''
+        this.form = { ...this.form }
+        // console.log('form',this.formInline)
+
       }
-      this.loading = true
-      getAction(this.url.list, query).then((res) => {
-        if (res.success) {
-          if (res.result.current > 1 && res.result.records.length == 0) {
-            this.pageNo = 1
-            this.getList()
-            return
-          }
-          this.dataSource = res.result.records || []
-          this.total = res.result.total
-          this.loading = false
-        } else {
-          this.loading = false
-        }
-      })
     },
     getData(){
       let otaIdT=localStorage.getItem('otaIdT')
@@ -407,20 +400,6 @@ this.$forceUpdate()
       this.save()
       this.$emit('safetyPrecautionsdown')
     },
-    uploadSuccess(data) {
-      let attIdList = []
-      if (data && data.length > 0) {
-        data.map(item => {
-          attIdList.push({
-            id:item.id,
-            fileName:item.fileName
-          })
-        })
-      }
-      /** 赋值给当前对应的表单文件 */
-      this.fileList.uploadName = attIdList
-      this.fileList.certifyingmaterials = this.$t('viewFile')
-    },
   }
 }
 </script>
@@ -464,7 +443,7 @@ this.$forceUpdate()
 }
 ::v-deep  .ant-layout-content {
   min-height: 60px;
-  line-height: 50px;
+  line-height: 20px;
 }
 //::v-deep  > .ant-layout {
 //  margin-bottom: 48px;
@@ -542,4 +521,9 @@ this.$forceUpdate()
   height: 50px;
   margin-top: 8px;
 }
+.spanone{
+  white-space: pre-wrap;
+  padding: 0 45px;
+  display: flex;
+}
 </style>

jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue

@@ -170,7 +170,7 @@
       <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
       <a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
     </div>
-    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
+    <uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
 </template>
 

jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue

@@ -150,13 +150,6 @@
                 <span class="title-text-text" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
               </div>
               <a-form-model-item class="itemModel" style="width: 38%">
-                <!-- <j-dict-select-tag class="box-input"
-                                   :disabled="disabled"
-                                   @change="projectNameChange"
-                                   :placeholder="$t('PleaseSelect')"
-                                   :type="'select'"
-                                   :triggerChange="false"
-                                   v-model="form.Vehicledynamictype"/> -->
                   <a-select class="box-input" v-model="form.dllx1"  :disabled="disabled"  :placeholder="$t('PleaseSelect')" @change="changeSelect($event,target)">
                     <a-select-option v-for="(item, key) in projectNameList1"
                                    :key="key"
@@ -181,8 +174,8 @@
           </a-col>
           <a-col :span="24">
             <div class="box-title-text-add">
-              <div class="title-text-add">
-                <span class="title-text-text" :title="$t('communicationTerminal')">{{$t('communicationTerminal')}}</span>
+              <div class="title-text-add plus">
+                <span class="title-text-text " :title="$t('communicationTerminal')">{{$t('communicationTerminal')}}</span>
               </div>
               <a-form-model-item class="itemModel">
                 <j-multi-select-tag class="box-input"
@@ -197,7 +190,7 @@
           </a-col>
           <a-col :span="24">
             <div class="box-title-text-add">
-              <div class="title-text-add">
+              <div class="title-text-add plus">
                 <span class="title-text-text" :title="$t('otaUpgradeManagementSystem')">{{$t('otaUpgradeManagementSystem')}}</span>
               </div>
               <a-form-model-item class="itemModel">
@@ -371,6 +364,7 @@ import { message } from 'ant-design-vue'
            if(res.code == 200){
             localStorage.setItem('otaId', res.result.otaId)
              this.$message.success(this.$t('SavedSuccessfully'))
+             this.getData()
           }
         })
           }
@@ -416,9 +410,9 @@ import { message } from 'ant-design-vue'
     font-weight: 500;
     font-size: 14px;
     margin-right: 16px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    // overflow: hidden;
+    // text-overflow: ellipsis;
+    // white-space: nowrap;
     height: 42px;
     line-height: 42px;
     margin-top: 3px;
@@ -475,4 +469,13 @@ import { message } from 'ant-design-vue'
   color: red;
   margin-right: 3px;
 }
+.plus{
+    margin-top: 5px;
+    line-height: 1.4 !important;
+  }
+  .plus2{
+    width: 134px;
+    margin-top: 5px;
+    line-height: 1.4 !important;
+  }
 </style>

jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue

@@ -75,10 +75,10 @@
           <a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :max-length="500"></a-input>
       </span>
       <span slot="operatingsystemversion" slot-scope="text,record">
-          <a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :max-length="500"></a-input>
+          <a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtbbh" :max-length="500"></a-input>
       </span>
       <span slot="inflammatorydata" slot-scope="text,record">
-          <a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtbbh" :max-length="500"></a-input>
+          <a-input :placeholder="$t('pleaseEnter')" v-model="record.csyzsj" :max-length="500"></a-input>
       </span>
       <!--      操作列-->
       <span slot="operation" slot-scope="text,record">
@@ -362,8 +362,11 @@ import ImportFile from '@/components/ImportFileData/index'
       },
       save(){
         postAction('/ota/otaBaCxKsjjsmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource,fj:this.fileList}).then(res =>{
-          console.log(res);
+          if(res.code==200){
           this.$message.success(this.$t('SavedSuccessfully'))
+           this.getData()
+        }
+       
         })
       },
       last(){

jero-web/src/views/otamanagement/vehicleinformation/components/other.vue

@@ -70,8 +70,11 @@ export default {
         if (valid) {
           this.flag = 1
           postAction('/ota/otaBaCxQt/add',{otaId:localStorage.getItem('otaId'),...this.queryParam}).then(res=>{
-           console.log(res);
-            this.$message.success(this.$t('SavedSuccessfully'))
+            if(res.code==200){
+          this.$message.success(this.$t('SavedSuccessfully'))
+           this.getData()
+        }
+       
           })
         } else {
           return false;

jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue

@@ -944,8 +944,11 @@ export default {
         cs:arr,
         kzq:this.dataSourceList
       }).then( res => {
-        console.log(res);
-        this.$message.success(this.$t('SavedSuccessfully'))
+        if(res.code==200){
+          this.$message.success(this.$t('SavedSuccessfully'))
+           this.getData()
+        }
+       
       })
 
     },

jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue

@@ -249,8 +249,11 @@ import ImportFile from '@/components/ImportFileData/index'
         obj.xxaqjz = this.dataSource[3].info
         obj.zmclList = this.fileList.uploadName
         postAction('/ota/otaBaCxAqcs/add',obj).then(res =>{
-          console.log(res);
+          if(res.code==200){
           this.$message.success(this.$t('SavedSuccessfully'))
+           this.getData()
+        }
+       
         })
       },
       last(){

jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue

@@ -295,8 +295,11 @@ export default {
       obj.sjzt = this.dataSource[9].relevantverification
       obj.zmclList = this.fileList.uploadName
       postAction('/ota/otaBaCxZxsjyq/add', obj).then(res => {
-        console.log(res);
-        this.$message.success(this.$t('SavedSuccessfully'))
+        if(res.code==200){
+          this.$message.success(this.$t('SavedSuccessfully'))
+           this.getData()
+        }
+       
       })
     },
     last() {

jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue

@@ -311,6 +311,7 @@ import uploadFileOta from '@/components/uploadFileOta/file'
         if(otaIdT==null){
           otaIdT=''
         }
+        let randomNum = Math.floor(Math.random()*99999999999+1)
           getAction('/ota/otaBaCxKsjxtmccs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
            if(res.code==200){
             if(res.result.list.length==0){
@@ -341,8 +342,9 @@ import uploadFileOta from '@/components/uploadFileOta/file'
           },
           ]
             }else{
-              res.result.list.forEach(item =>{
-                item.sfksj =Number(item.sfksj)
+              res.result.list.forEach((item,index) =>{
+                item.sfksj = Number(item.sfksj)
+                item.key = randomNum + index
               })
               this.dataSource=res.result.list
               this.fileList = res.result.fj
@@ -457,8 +459,11 @@ import uploadFileOta from '@/components/uploadFileOta/file'
       },
       save(){
         postAction('/ota/otaBaCxKsjxtmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource,fj:this.fileList}).then(res => {
-            console.log(res);
-          this.$message.success(this.$t('SavedSuccessfully'))
+          if(res.code==200){
+            this.$message.success(this.$t('SavedSuccessfully'))
+            this.getData()
+          }
+          
         })
       }
     }

jero-web/src/views/otamanagement/vehicleregistration/index.vue

@@ -256,7 +256,7 @@ export default {
           align: 'left',
           ellipsis: true,
           width: 170,
-          dataIndex: 'cjsj'
+          dataIndex: 'createTime'
         },
         {
           title: this.$t('remarks'),

jero-web/src/views/projectManagement/components/certificationList/index.vue

@@ -78,7 +78,7 @@
         </div>
 
         <!--        保存-->
-        <div @click="preservationClick(1)" v-if="roleSwitchingCode == 2" class="operator-text">
+        <div @click="preservationClick(1)" v-if="roleSwitchingCode == 2 || roleSwitchingCode == 0" class="operator-text">
           <a-icon type="check-circle"/>
           {{ $t('preservation') }}
         </div>
@@ -333,7 +333,7 @@
         </span>
         <span slot="reportNo" slot-scope="text,record">
                   <a-input class="box-input-index"
-                           v-if="roleSwitchingCode == 2"
+                           v-if="roleSwitchingCode == 2 || roleSwitchingCode == 0"
                            :maxLength="200"
                            onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                            v-model.trim="record.reportNumber"
@@ -342,7 +342,7 @@
         </span>
         <span slot="productModel" slot-scope="text,record">
                   <a-input class="box-input-index"
-                           v-if="roleSwitchingCode == 2"
+                           v-if="roleSwitchingCode == 2 || roleSwitchingCode == 0"
                            :maxLength="200"
                            onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                            v-model.trim="record.productModel"
@@ -351,7 +351,7 @@
         </span>
         <span slot="nameOfManufacturer" slot-scope="text,record">
                   <a-input class="box-input-index"
-                           v-if="roleSwitchingCode == 2"
+                           v-if="roleSwitchingCode == 2 || roleSwitchingCode == 0"
                            :maxLength="200"
                            onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                            v-model.trim="record.productionEnterpriseName"
@@ -815,7 +815,7 @@
       },
       onChange(page, pageSize) {
         this.pageNo = page
-        if (this.roleSwitchingCode == 2) {
+        if (this.roleSwitchingCode == 2 || this.roleSwitchingCode == 0) {
           this.preservationClick()
         }
         this.getList()
@@ -823,7 +823,7 @@
       SizeChange(page, pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
-        if (this.roleSwitchingCode == 2) {
+        if (this.roleSwitchingCode == 2 || this.roleSwitchingCode == 0) {
           this.preservationClick()
         }
         this.getList()

jero-web/src/views/projectManagement/components/listEditModel.vue

@@ -782,11 +782,11 @@
             </div>
           </a-col>
         </a-row>
-        <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0">
-          {{$t('listConfirmationRejectionReason')}}
+        <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0 && formInline.roleCodeIndex == 0">
+          {{$t('reasonForReturnOfDesignCompliance')}}
         </div>
 
-        <div v-if="rejectCauseList && rejectCauseList.length > 0"
+        <div v-if="rejectCauseList && rejectCauseList.length > 0 && formInline.roleCodeIndex == 0"
              v-for="(item,index) in rejectCauseList">
           <a-row :gutter="24">
             <a-col :span="12">
@@ -827,11 +827,11 @@
           </a-row>
         </div>
 
-        <div class="header-text" v-if="rejectCauseListOne && rejectCauseListOne.length > 0">
-          {{$t('taskConfirmationRejectionReason')}}
+        <div class="header-text" v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 0">
+          {{$t('verifyComplianceConfirmReturnReason')}}
         </div>
 
-        <div v-if="rejectCauseListOne && rejectCauseListOne.length > 0"
+        <div v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 0"
              v-for="(item,index) in rejectCauseListOne">
           <a-row :gutter="24">
             <a-col :span="12">

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -146,7 +146,7 @@
         <!--        更多-->
         <a-popconfirm overlayClassName="popconfirm" placement="bottomRight" v-if="this.roleSwitchingCode == '0'">
           <template slot="title" id="popconfirm">
-            <div style="height:320px;overflow:scroll;overflow-x: auto;">
+            <div>
               <!--              添加-->
               <div @click="handleAdd" class="operator-text-title">
                 <a-icon type="plus"/>