From 1354947530ddefb77a3b067ec40c46674576b41c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 29 Mar 2023 16:43:20 +0800 Subject: [PATCH 1/7] bug 67553 --- .../components/upgradeimpactassessment.vue | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index e7ec6ed0c..c1da12f15 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -92,8 +92,8 @@ {{$t('conditionsareupgradesperformed')}} - - + {{$t('upgradefailureorinterruption')}} - - + {{$t('upgradepackagetest')}} - - + \ No newline at end of file From 90d91b566652c130efb3f4240ef2331e7bb179ae Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 29 Mar 2023 16:50:54 +0800 Subject: [PATCH 2/7] bug 67590 --- .../components/upgradeimpactassessment.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index c1da12f15..6f7e5f449 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -86,7 +86,7 @@ form.clfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') }} - {{$t('notetwo')}} + {{$t('notethree')}} {{$t('format')}} From ae0e90e6c820128c7fb6f8a608369a9a96fefd79 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 29 Mar 2023 17:22:53 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/otamanagement/upgradeactivity/components/gnxtwh.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue index 99c367baa..4bb063ae6 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue @@ -388,7 +388,7 @@ export default { .header-text { position: relative; top: 11px; - left: -70px; + left: -39px; width: 55px; font-size: 16px; font-weight: 500; From 76cab7a0bb80d0e068f1b76188409d993c5c2e4b Mon Sep 17 00:00:00 2001 From: yuekuo Date: Wed, 29 Mar 2023 17:31:24 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thetargetvehicleofthisupgrade.vue | 11 +- .../upgradeimpactassessment copy.vue | 541 ------------------ .../components/upgradetargetmodel.vue | 10 +- 3 files changed, 16 insertions(+), 546 deletions(-) delete mode 100644 jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment copy.vue diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 67b396f2d..4367f3867 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -144,6 +144,8 @@ export default { this.formInline.vinList=res.result.vinList this.formInline.csv=res.result.csv this.formInline.dateofproduction=[] + res.result.scrqks=res.result.scrqks == null ? "" : res.result.scrqks + res.result.scrqjs=res.result.scrqjs == null ? "" : res.result.scrqjs this.formInline.dateofproduction.push(res.result.scrqks) this.formInline.dateofproduction.push(res.result.scrqjs) this.formInline.id = res.result.vinList @@ -159,8 +161,13 @@ export default { 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] + if(this.formInline.dateofproduction.length>0){ + obj.scrqks = this.formInline.dateofproduction[0] + obj.scrqjs = this.formInline.dateofproduction[1] + }else{ + obj.scrqks='' + obj.scrqjs ='' + } }else{ obj.scrqks='' obj.scrqjs ='' diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment copy.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment copy.vue deleted file mode 100644 index fb6045b3d..000000000 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment copy.vue +++ /dev/null @@ -1,541 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 08939f295..e4f9fb135 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -67,7 +67,7 @@ {{$t('Modelandfunctionrecord')}} - + {{ item.ggpc }} @@ -314,8 +314,12 @@ import ImportFile from '@/components/ImportFileData/index' this.form.cpsb = item.cpsb this.form.cpmc = item.cpmc this.form.cpxh = item.cpxh - this.form.babh = item.cpdjbh - } + getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{ + this.form.dllx1=res.result.dllx1 + this.form.dllx2=res.result.dllx2 + this.$forceUpdate() + }) + } }) this.$forceUpdate() }, From 5ab0c3c91dbb480da0b98a7db7efa3a4c76a7cf7 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 29 Mar 2023 17:33:38 +0800 Subject: [PATCH 5/7] bug 67613 --- .../views/otamanagement/upgradeactivity/components/gnxtwh.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue index 4bb063ae6..54bb647c5 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue @@ -71,7 +71,7 @@
- + * {{$t('gnxt')}}
@@ -88,6 +88,7 @@
+ * {{$t('dykzq') + (index+1)}}
Date: Wed, 29 Mar 2023 17:38:09 +0800 Subject: [PATCH 6/7] =?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 --- .../service/impl/OtaBaCxAqcsServiceImpl.java | 30 ++++++----------- .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 12 ++++++- .../impl/OtaBaCxZxsjyqServiceImpl.java | 33 +++++++------------ .../impl/OtaBaSjSjmbclServiceImpl.java | 1 + 4 files changed, 33 insertions(+), 43 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 85b38658b..c7420a449 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 @@ -28,6 +28,8 @@ import java.io.File; import java.io.InputStream; import java.util.List; import java.util.Date; +import java.util.Map; +import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.web.multipart.MultipartFile; @@ -95,28 +97,16 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl 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())); + Map newAttMap = otaBaCxAqcs.getZmclList().stream().collect(Collectors.toMap(AttachmentEO::getId, AttachmentEO::getFileName)); + Map oldAttMap = otaBaCxAqcsOld.getZmclList().stream().collect(Collectors.toMap(AttachmentEO::getId, AttachmentEO::getFileName)); + for (String nId : newAttMap.keySet()) { + if (!oldAttMap.containsKey(nId)) { + reList.add(cu.addAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", newAttMap.get(nId))); } } - 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())); + for (String oId : oldAttMap.keySet()) { + if (!newAttMap.containsKey(oId)) { + reList.add(cu.delAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", newAttMap.get(oId))); } } otaBaCxTxjlService.saveBatch(reList); 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 a31008aac..d5461ddf2 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 @@ -18,7 +18,7 @@ import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.utils.ComparisonUtil; import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; -import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -107,6 +107,16 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KSJDXTMCYCS, OtaTitleEnum.XTLB.getName(), oldList, newList, sysDictService); saveOrUpdateBatch(newList); + + + for (OtaBaCxKsjxtmccs newMccs:newList) { + String newTpt = newMccs.getTpt(); + if(StringUtils.isNotEmpty(newTpt)){ + + + } + + } otaBaCxTxjlService.saveBatch(reList); String fj = (String) json.get("fj"); if (StringUtils.isNotEmpty(fj)) { 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 d4cc7dc9e..3a84bef71 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 @@ -17,8 +17,6 @@ import com.jero.modules.ota.service.IOtaBaCxZxsjyqService; import com.jero.modules.ota.utils.ComparisonUtil; import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; -import org.apache.commons.collections4.ListUtils; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Cell; @@ -36,6 +34,8 @@ import java.io.File; import java.io.InputStream; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * @Description: 车型备案-在线升级要求 @@ -101,28 +101,17 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl 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())); + Map newAttMap = otaBaCxZxsjyq.getZmclList().stream().collect(Collectors.toMap(AttachmentEO::getId, AttachmentEO::getFileName)); + Map oldAttMap = otaBaCxZxsjyqOld.getZmclList().stream().collect(Collectors.toMap(AttachmentEO::getId, AttachmentEO::getFileName)); + + for (String nId : newAttMap.keySet()) { + if (!oldAttMap.containsKey(nId)) { + reList.add(cu.addAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", newAttMap.get(nId))); } } - 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())); + for (String oId : oldAttMap.keySet()) { + if (!newAttMap.containsKey(oId)) { + reList.add(cu.delAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", newAttMap.get(oId))); } } otaBaCxTxjlService.saveBatch(reList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java index 5d54760a5..f03bccacc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java @@ -71,6 +71,7 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl Date: Wed, 29 Mar 2023 17:43:50 +0800 Subject: [PATCH 7/7] bug 67619 67610 --- .../upgradeactivity/components/gnxtwh.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue index 54bb647c5..9bf23dc6d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue @@ -94,7 +94,7 @@
-
@@ -166,7 +166,7 @@ export default { message: this.$t('gnxt') + this.$t('cannotEmpty'), trigger: 'blur' }, - {max: 50,message: this.$t('relevantSections') + this.$t('cannotExceed') + 50 + this.$t('Characters'),trigger: 'blur' + {max: 50,message: this.$t('gnxt') + this.$t('cannotExceed') + 50 + this.$t('Characters'),trigger: 'blur' } ], // dykzq: [ @@ -248,7 +248,10 @@ export default { this.formInline.dataList.splice(index + 1, 0, {}) this.formInline = { ...this.formInline } }, - deleteClick(index) { + deleteClick(index,value) { + this.$nextTick(() => { + this.$refs.ruleForm.validateField([value]) + }) this.formInline.dataList.splice(index, 1) this.formInline = { ...this.formInline } },