From 7fc7c84473085cda0ab829df6250cc74890d5734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 31 Mar 2023 13:26:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF-?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/basicInformation.vue | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index a66145229..d4cebc19b 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -155,17 +155,19 @@
{{$t('Vehicledynamictype')}}
- - - - {{ item }} - - - - - + +
+
+ + + {{ item }} + + +
+
+ @@ -175,7 +177,9 @@ --> - +
+
+ @@ -343,7 +347,7 @@ import { message } from 'ant-design-vue' if(res.result.dllx2 == null){ res.result.dllx2 = undefined } - + if(res.result.cplb == null){ res.result.cplb = undefined } @@ -380,7 +384,7 @@ import { message } from 'ant-design-vue' if(otaId==null || otaId == undefined){ otaId='' } - + postAction('/ota/otaBaCxJbxx/add',{ otaId:otaId,...this.form}).then( res => { if(res.code == 200){ localStorage.setItem('otaId', res.result.otaId) @@ -419,7 +423,7 @@ import { message } from 'ant-design-vue' if(this.form.dllx1=='其他'){ this. projectNameList2=['其他'] } - + }, update(){ From 082521657e487fc10e7c3cfc078ca8cca7501084 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 13:43:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E4=BA=86=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BA=BA,=E5=A6=82=E6=9E=9C=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E6=98=AF=E7=A9=BA=EF=BC=8C=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=B8=A6=E5=85=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/job/InventoryAffirmJob.java | 2 +- ...ctCertificationInventoryEOServiceImpl.java | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index e326545a5..5868282ee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -86,7 +86,7 @@ public class InventoryAffirmJob implements Job { queryWrapperInventory.and(queryWrapper -> { queryWrapper.lambda().eq(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); queryWrapper.or(or -> { - or.lambda().eq(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + or.lambda().eq(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); }); }); List projectLawsInventoryEOList = this.projectLawsInventoryEOMapper.selectList(queryWrapperInventory); 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 43a5b0a77..404055c17 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 @@ -373,11 +373,39 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl idList = Arrays.asList(ids.split(",")); + QueryWrapper pciQueryWrap = new QueryWrapper<>(); + pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getId,idList); + List pciEoList = this.list(pciQueryWrap); + List updateList = new ArrayList<>(); for (String id : idList) { ProjectCertificationInventoryEO updateProjectCertificationInventoryEO = new ProjectCertificationInventoryEO(); BeanUtils.copyProperties(projectCertificationInventoryEO,updateProjectCertificationInventoryEO); updateProjectCertificationInventoryEO.setId(id); + + /** + * 2023-03-30 17.36新增该需求。 + * 如果用户批量设置了工程接口人字段 + * 那就需要判断所选数据中责任人是否为空 + * 如果责任人字段为空时 需要将工程接口人带入到所选数据的责任人字段中 + */ + if(StringUtils.isNotBlank(projectCertificationInventoryEO.getSdt())){ + List pciEoListTemp = pciEoList.stream().filter(pciEo -> { + boolean flag = false; + if (StringUtils.equals(pciEo.getId(), id)) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(pciEoListTemp)){ + ProjectCertificationInventoryEO pciEo = pciEoListTemp.get(0); + if(StringUtils.isEmpty(pciEo.getDutyPerson())){ + updateProjectCertificationInventoryEO.setDutyPerson(projectCertificationInventoryEO.getSdt()); + } + } + } + updateList.add(updateProjectCertificationInventoryEO); } From 10bf8d92795a4b1adab683b582ff1c480cf81175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 31 Mar 2023 14:29:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=B7=BB=E5=8A=A0=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 2 +- .../certificationListMaintenance.vue | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index bdf7b4c0f..08346013d 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -918,7 +918,7 @@ module.exports = { virtualAuthenticationListDetails: '虚拟认证清单详情', VirtualAuthenticationList: '虚拟认证清单', maintainVirtualList: '维护市场清单', - certificationListMaintenance: '认证清单维护', + certificationListMaintenance: '市场认证清单维护', reasonsForRejection: '驳回原因', inconformity: '不符合', toTrack: '待追踪', diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index f71c23b26..d6f76858b 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -3,7 +3,7 @@
- {{isTrue ? $t('certificationListMaintenance'):$t('virtualAuthenticationListDetails')}} + {{isTrue ? $t('certificationListMaintenance'):$t('marketCertificationListDetails')}}
@@ -393,7 +393,7 @@ }, //模板下载 handleModule() { - downloadFile(this.url.exportTemplate, this.$t('certificationList') + this.$t('importTemplate') + '.xls', {}) + downloadFile(this.url.exportTemplate, this.$t('marketCertificationList') + this.$t('importTemplate') + '.xls', {}) }, //调取 transferClick() { @@ -411,7 +411,7 @@ ids: selectedRowKeys.join(','), authDummyInventoryBaseId: this.$route.query.id } - downloadFile(this.url.exportData, this.$route.query.name + this.$t('certificationList') + '.zip', query, this.Deselect) + downloadFile(this.url.exportData, this.$route.query.name + this.$t('marketCertificationList') + '.zip', query, this.Deselect) }, Deselect() { this.selectedRowKeys = [] From 1d9a08b2c31edb2277da4c5e16eb177b6245a895 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 14:37:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?66936=20=E8=99=9A=E6=8B=9F=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=EF=BC=8C=E5=AF=BC=E5=85=A5=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E3=80=81=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/entity/DummyInventoryInfoEO.java | 12 ++--- .../dummy/entity/DummyInventoryInfoEOEn.java | 6 +-- .../impl/DummyInventoryInfoEOServiceImpl.java | 50 ++++++++++--------- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java index 4b0c27a13..1ed1f31ef 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java @@ -215,7 +215,7 @@ public class DummyInventoryInfoEO implements Serializable { private java.lang.String designDeliverableTemplateName; /**设计符合性确认-发起人*/ - @Excel(name = "设计-发起人", width = 15,dicCode ="fa1_qi3_ren2") +// @Excel(name = "设计-发起人", width = 15,dicCode ="fa1_qi3_ren2") @ApiModelProperty(value = "设计符合性确认-发起人") //@Dict(dicCode ="fa1_qi3_ren2") private java.lang.String designInitiator; @@ -235,7 +235,7 @@ public class DummyInventoryInfoEO implements Serializable { private String designRemark; /**prehomo确认-交付物类型*/ - @Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template") +// @Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template") @ApiModelProperty(value = "prehomo确认-交付物类型") // @Dict(dicCode ="deliverable_template") private java.lang.String prehomoDeliverableType; @@ -253,7 +253,7 @@ public class DummyInventoryInfoEO implements Serializable { private java.lang.String prehomoDeliverableTemplateName; /**prehomo确认-发起人*/ - @Excel(name = "Prehomo-发起人", width = 15,dicCode ="fa1_qi3_ren2") +// @Excel(name = "Prehomo-发起人", width = 15,dicCode ="fa1_qi3_ren2") @ApiModelProperty(value = "prehomo确认-发起人") //@Dict(dicCode ="fa1_qi3_ren2") private java.lang.String prehomoInitiator; @@ -261,7 +261,7 @@ public class DummyInventoryInfoEO implements Serializable { private String prehomoInitiator_dictText; /**prehomo确认-责任人*/ - @Excel(name = "Prehomo-责任人", width = 15,dicCode ="ze2_ren4_ren2") +// @Excel(name = "Prehomo-责任人", width = 15,dicCode ="ze2_ren4_ren2") @ApiModelProperty(value = "prehomo确认-责任人") //@Dict(dicCode ="ze2_ren4_ren2") private java.lang.String prehomoDuty; @@ -269,7 +269,7 @@ public class DummyInventoryInfoEO implements Serializable { private String prehomoDuty_dictText; //prehomo确认-交付物说明 - @Excel(name = "prehomo确认-交付物说明", width = 20) +// @Excel(name = "prehomo确认-交付物说明", width = 20) private String prehomoRemark; /**验证符合性确认-交付物类型*/ @@ -290,7 +290,7 @@ public class DummyInventoryInfoEO implements Serializable { private java.lang.String verifyDeliverableTemplateName; /**验证符合性确认-发起人*/ - @Excel(name = "验证-发起人", width = 15,dicCode ="fa1_qi3_ren2") +// @Excel(name = "验证-发起人", width = 15,dicCode ="fa1_qi3_ren2") @ApiModelProperty(value = "验证符合性确认-发起人") //@Dict(dicCode ="fa1_qi3_ren2") private java.lang.String verifyInitiator; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java index d723a4612..a9643b2ca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java @@ -187,7 +187,7 @@ public class DummyInventoryInfoEOEn implements Serializable { /**设计符合性确认-发起人*/ - @Excel(name = "Design Initiator", width = 30) +// @Excel(name = "Design Initiator", width = 30) @ApiModelProperty(value = "设计符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String designInitiator; @@ -218,7 +218,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String prehomoDeliverableTemplateName; /**prehomo确认-发起人*/ - @Excel(name = "Prehomo Initiator", width = 30) +// @Excel(name = "Prehomo Initiator", width = 30) @ApiModelProperty(value = "prehomo确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String prehomoInitiator; @@ -248,7 +248,7 @@ public class DummyInventoryInfoEOEn implements Serializable { private String verifyDeliverableTemplateName; /**验证符合性确认-发起人*/ - @Excel(name = "Verify Initiator", width = 30) +// @Excel(name = "Verify Initiator", width = 30) @ApiModelProperty(value = "验证符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String verifyInitiator; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index ec4d8f52d..929870332 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1182,6 +1182,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 8){ String flag = ""; - if(8 < j && j < 14){ + if(8 < j && j < 13){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ flag ="设计"; }else{ @@ -1626,15 +1630,15 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl