From ae76a8983a56a93e3424bc34b41a26b324dd6381 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 29 Mar 2023 15:57:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?67329=20=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E5=BC=95=E7=94=A8=E4=BA=A4=E4=BB=98=E7=89=A9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectCertificationInventoryEOServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 9266877f8..f003acfa6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -3854,6 +3854,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl noCiteInspectionItem = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { + String deliveryResult = ""; for (ProjectCertificationInventoryEO citeProjectCertificationInventoryEO : citeProjectCertificationInventoryEOList) { // 匹配数据 类别、检验项目、配置项、标准编号、交付物类型完全一致，并且数据的状态为 审查完成 boolean flag = ( @@ -3863,13 +3864,17 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 16:03:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?67262=20=E6=96=87=E6=A1=A3=E5=BA=93-?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=88=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?-=E5=B7=A5=E4=BD=9C=E8=A1=A8=E5=90=8D=E7=A7=B0=E6=98=AF?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index dfc132eed..c12829455 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5076,6 +5076,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map, HttpServletResponse response, HttpServletRequest request) { OutputStream os = null; HSSFWorkbook workbook = new HSSFWorkbook(); + String cut = (String) map.get("cut"); + String sheetName = ""; + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + sheetName = "文档库导入模板"; + }else { + sheetName = "Document LibraryImport Template"; + } String fileOriName = "文档库导入模板.xls"; String filePath = uploadpath + File.separator + fileOriName; try { @@ -5086,7 +5093,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 16:08:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?OTA=E8=BD=A6=E5=9E=8B-=E6=B7=BB=E5=8A=A0-?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/recordparameters.vue | 57 ++++++++++++------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index fc0b2d14b..d5b38ab0f 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -15,58 +15,58 @@
{{$t('componentname')}} -   {{$t('networksecurityrequirements')}} + {{$t('networksecurityrequirements')}} -   {{$t('millimeterwaveradar')}} + {{$t('millimeterwaveradar')}} -   {{$t('ultrasonicradar')}} + {{$t('ultrasonicradar')}} -   {{$t('camera')}} + {{$t('camera')}} -   {{$t('asternimage')}} + {{$t('asternimage')}} -   {{$t('Monocularbinocularmultiocular')}} + {{$t('Monocularbinocularmultiocular')}} -   {{$t('driverattentionmonitoringsystem')}} + {{$t('driverattentionmonitoringsystem')}} -   {{$t('driversurveillancecamera')}} + {{$t('driversurveillancecamera')}} -   {{$t('drivermonitoringinfraredsensor')}} + {{$t('drivermonitoringinfraredsensor')}} - -   {{$t('positioningandnavigationsystem')}} + + {{$t('positioningandnavigationsystem')}} {{$t('vehiclesatellitepositioningequipment')}} -   {{$t('inertialnavigationsystem')}} + {{$t('inertialnavigationsystem')}} -   {{$t('wheelspeedmeter')}} + {{$t('wheelspeedmeter')}} -   {{$t('highprecisionmap')}} + {{$t('highprecisionmap')}} -   {{$t('electronicfence')}} + {{$t('electronicfence')}} -   {{$t('vehiclecommunicationsystem')}} + {{$t('vehiclecommunicationsystem')}} @@ -86,10 +86,10 @@ -   {{$t('automaticDrivingDataRecordingSystem')}} + {{$t('automaticDrivingDataRecordingSystem')}} - -   {{$t('eventdatarecordingsystem')}} + + {{$t('eventdatarecordingsystem')}}
@@ -1067,6 +1067,7 @@ button{ width: 100%; height: 200px; line-height: 200px; + padding: 10px; } .radio-text-two{ display: inline-block; @@ -1076,6 +1077,9 @@ button{ width: 100%; height: 100px; line-height: 100px; + padding: 10px; + display: flex; + align-items: center; } .radio-text-three{ display: inline-block; @@ -1085,6 +1089,9 @@ button{ width: 100%; height: 50px; line-height: 50px; + padding: 10px; + align-items: center; + display: flex; } .radio-text-four{ display: inline-block; @@ -1094,6 +1101,7 @@ button{ width: 100%; height: 250px; line-height: 250px; + padding: 10px; } .radio-text-five{ display: inline-block; @@ -1103,6 +1111,7 @@ button{ width: 100%; height: 150px; line-height: 150px; + padding: 10px; } .text-box{ display: inline-block; @@ -1131,6 +1140,7 @@ button{ display: flex; justify-content: left; align-items: center; + padding: 10px; } .text-text-two{ /*display: inline-block;*/ @@ -1144,6 +1154,7 @@ button{ display: flex; justify-content: left; align-items: center; + padding: 10px; } .text-text-three{ /*display: inline-block;*/ @@ -1156,6 +1167,7 @@ button{ display: flex; justify-content: left; align-items: center; + padding: 10px; } .text-text-five{ /*display: inline-block;*/ @@ -1168,6 +1180,7 @@ button{ display: flex; justify-content: left; align-items: center; + padding: 10px; } .text-box-three{ display: inline-block; @@ -1177,6 +1190,7 @@ button{ width: 100%; height: 250px; line-height: 250px; + padding: 10px; } .text-box-four{ display: inline-block; @@ -1218,7 +1232,10 @@ button{ border-right: none; width: 100%; height: 100px; - line-height: 100px; + line-height: 20px; + display: flex; + align-items: center; + padding: 10px; } span{ /* overflow: hidden; /*超出部分隐藏*/ From 94202e0a19465da362e6d85aa88758cd48b1fbca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 16:21:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/entity/OtaBaCxAqcs.java | 3 +- .../modules/ota/entity/OtaBaCxZxsjyq.java | 3 +- .../jero/modules/ota/enums/OtaTitleEnum.java | 1 - .../service/impl/OtaBaCxAqcsServiceImpl.java | 30 ++++++++++++++++++ .../impl/OtaBaCxZxsjyqServiceImpl.java | 31 +++++++++++++++++++ .../modules/ota/utils/ComparisonUtil.java | 13 ++++++++ 6 files changed, 78 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java index 7b73501d0..fd3829332 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java @@ -3,6 +3,7 @@ package com.jero.modules.ota.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; @@ -99,6 +100,6 @@ public class OtaBaCxAqcs implements Serializable { private java.lang.String zmcl; @TableField(exist = false) - private List zmclList; + private List zmclList = new ArrayList<>(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java index 6cc9a8581..24984285d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java @@ -3,6 +3,7 @@ package com.jero.modules.ota.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; @@ -125,6 +126,6 @@ public class OtaBaCxZxsjyq implements Serializable { private java.lang.String zmcl; @TableField(exist = false) - private List zmclList; + private List zmclList = new ArrayList<>(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 8dd21374f..33d7f382a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -32,7 +32,6 @@ public enum OtaTitleEnum { SJSBAQ("sjsbaq", "升级失败安全状态", "2"), SJGG("sjgg", "升级公告", "2"), SJZT("sjzt", "升级结果状态", "2"), - ZMCL("zmcl", "证明材料", "0"), BHJZ("bhjz", "保护机制", "protection_mechanism"), FSXJZ("fsxjz", "防失效机制", "fail_safe_mechanism"), 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 452839e8e..85b38658b 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 @@ -76,6 +76,7 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl 0) { JSONArray obj = new JSONArray(); for (AttachmentEO aeo : otaBaCxAqcs.getZmclList()) { @@ -83,12 +84,41 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl aeoList = JSONArray.parseArray(otaBaCxAqcsOld.getZmcl(), AttachmentEO.class); + otaBaCxAqcsOld.setZmclList(aeoList); + } saveOrUpdate(otaBaCxAqcs); ComparisonUtil cu = new ComparisonUtil(); if (ObjectUtils.isEmpty(otaBaCxAqcsOld)) { otaBaCxAqcsOld = new OtaBaCxAqcs(); } List reList = cu.comparisonRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, otaBaCxAqcsOld, otaBaCxAqcs, sysDictService); + + for (AttachmentEO aeoNew : otaBaCxAqcs.getZmclList()) { + boolean flag = true; + for (AttachmentEO aeoOld : otaBaCxAqcsOld.getZmclList()) { + if (aeoNew.getId().equals(aeoOld.getId())) { + flag = false; + break; + } + } + if (flag) { + reList.add(cu.addAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", aeoNew.getFileName())); + } + } + for (AttachmentEO aeoOld : otaBaCxAqcsOld.getZmclList()) { + boolean flag = true; + for (AttachmentEO aeoNew : otaBaCxAqcs.getZmclList()) { + if (aeoOld.getId().equals(aeoNew.getId())) { + flag = false; + break; + } + } + if (flag) { + reList.add(cu.delAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", aeoOld.getFileName())); + } + } otaBaCxTxjlService.saveBatch(reList); } } 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 32d24f4a3..d4cc7dc9e 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 @@ -81,6 +81,7 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl 0) { JSONArray obj = new JSONArray(); for (AttachmentEO aeo : otaBaCxZxsjyq.getZmclList()) { @@ -88,12 +89,42 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl aeoList = JSONArray.parseArray(otaBaCxZxsjyqOld.getZmcl(), AttachmentEO.class); + otaBaCxZxsjyqOld.setZmclList(aeoList); + } saveOrUpdate(otaBaCxZxsjyq); + ComparisonUtil cu = new ComparisonUtil(); if (ObjectUtils.isEmpty(otaBaCxZxsjyqOld)) { otaBaCxZxsjyqOld = new OtaBaCxZxsjyq(); } + List reList = cu.comparisonRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, otaBaCxZxsjyqOld, otaBaCxZxsjyq, sysDictService); + for (AttachmentEO aeoNew : otaBaCxZxsjyq.getZmclList()) { + boolean flag = true; + for (AttachmentEO aeoOld : otaBaCxZxsjyqOld.getZmclList()) { + if (aeoNew.getId().equals(aeoOld.getId())) { + flag = false; + break; + } + } + if (flag) { + reList.add(cu.addAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", aeoNew.getFileName())); + } + } + for (AttachmentEO aeoOld : otaBaCxZxsjyqOld.getZmclList()) { + boolean flag = true; + for (AttachmentEO aeoNew : otaBaCxZxsjyq.getZmclList()) { + if (aeoOld.getId().equals(aeoNew.getId())) { + flag = false; + break; + } + } + if (flag) { + reList.add(cu.delAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", aeoOld.getFileName())); + } + } otaBaCxTxjlService.saveBatch(reList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index 257d5b1a0..5a7c9dd7e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -22,6 +22,19 @@ public class ComparisonUtil { public ComparisonUtil() { } + + public OtaBaCxTxjl addAttRecord(String otaId, OtaModuleEnum otaModuleEnum, String title, String attName) { + String content = title + "中添加了附件:'" + attName; + OtaBaCxTxjl jl = new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content); + return jl; + } + + public OtaBaCxTxjl delAttRecord(String otaId, OtaModuleEnum otaModuleEnum, String title, String attName) { + String content = title + "中删除了附件:'" + attName; + OtaBaCxTxjl jl = new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content); + return jl; + } + /** * 对比字段并添加到记录 */