From db7df3d26ff513b2e1577b2626c25af9305b298f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 7 Dec 2023 14:22:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=E5=B9=B3=E5=8F=B0=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/components/addModel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index e1b43a2ac..7f5029bb3 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -862,7 +862,7 @@ }, { title: this.$t('deliverableTemplate'), - dataIndex: 'deliverableTemplate', + dataIndex: 'deliverableTemplateName', align: 'left', ellipsis: true, width: 200 From fa489c167253dd0e19ebe48a92571823d215a662 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 7 Dec 2023 14:25:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 5 ++++ .../ProjectCertificationInventoryEO.java | 3 +++ ...ctCertificationInventoryEOServiceImpl.java | 23 ++++++++++++------- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 9a570c70a..c29d15589 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -682,3 +682,8 @@ ALTER TABLE `project_certification_inventory` ADD COLUMN `duty_depart` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任部门' AFTER `attestation_type`; +-- 认证清单 添加关联平台件认证清单id 2023-12-7 未同步生产环境 +ALTER TABLE `project_certification_inventory` +ADD COLUMN `platform_certification_inventory_id` varchar(36) NULL COMMENT '平台件-认证清单id' AFTER `remark`; + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java index cca2bfad4..4e2469f9a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java @@ -271,4 +271,7 @@ public class ProjectCertificationInventoryEO implements Serializable { @TableField(exist = false) private String projectName; + + @ApiModelProperty(value = "平台件-认证清单id") + private String platformCertificationInventoryId; } 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 6e8eb8ba6..fa8b3b6ec 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 @@ -7391,6 +7391,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl(); } ProjectCertificationInventoryEO certificationInventoryEO = projectCertificationInventoryEOService.queryById(lawsInventoryPlatformEOList.get(0).getLawsInventoryId()); + //平台件的平台件认证清单 + ProjectCertificationInventoryEO certificationInventoryEOTemp = + projectCertificationInventoryEOService.queryById(certificationInventoryEO.getPlatformCertificationInventoryId()); + //交付物模板 - String deliverableTemplate = certificationInventoryEO.getDeliverableTemplate(); + String deliverableTemplate = certificationInventoryEOTemp.getDeliverableTemplate(); if(StringUtils.isNotBlank(deliverableTemplate)){ List fileInfos = iOSSFileService.getFileInfos(StringUtils.join(deliverableTemplate, ",")); - certificationInventoryEO.setDeliverableTemplateName(fileInfos.get(0).getFileName()); + certificationInventoryEOTemp.setDeliverableTemplateName(fileInfos.get(0).getFileName()); } //交付物类型 - String deliverableType = certificationInventoryEO.getDeliverableType(); + String deliverableType = certificationInventoryEOTemp.getDeliverableType(); if(StringUtils.isNotBlank(deliverableType)){ List categoryList = sysCategoryService.list(); String name = getTreeName(cut, categoryList, Arrays.asList(deliverableType.split(","))); - certificationInventoryEO.setDeliverableTypeName(name); + certificationInventoryEOTemp.setDeliverableTypeName(name); } + + + //平台件认证清单对应的法规 + List projectLibraryBaseList = projectLibraryBaseMapper.queryById(certificationInventoryEOTemp.getProjectLibraryId()); //平台件项目名称 - String projectLibraryId = certificationInventoryEO.getProjectLibraryId(); - List projectLibraryBaseList = projectLibraryBaseMapper.queryById(projectLibraryId); if(ObjectUtils.isNotEmpty(projectLibraryBaseList)){ ProjectLibraryBase projectLibraryBase = projectLibraryBaseList.get(0); //目标市场 英文 @@ -7500,10 +7507,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryEOList = new ArrayList<>(); - projectCertificationInventoryEOList.add(certificationInventoryEO); + projectCertificationInventoryEOList.add(certificationInventoryEOTemp); return projectCertificationInventoryEOList; } From ee6fb4e1ea0803d280a6209afc17316a11344e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 7 Dec 2023 14:25:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=E5=B9=B3=E5=8F=B0=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/components/addModel.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 7f5029bb3..6bb785eb4 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -692,12 +692,12 @@ -
+
 {{$t('PlatformInformation')}}
- - Date: Thu, 7 Dec 2023 14:38:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=E5=B9=B3=E5=8F=B0=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationList/components/addModel.vue | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 6bb785eb4..3e7da8e95 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -705,6 +705,14 @@ :data-source="dataList" :pagination="false" :loading="loading"> + + + {{record.deliverableTemplateName}} + +
@@ -865,7 +873,8 @@ dataIndex: 'deliverableTemplateName', align: 'left', ellipsis: true, - width: 200 + width: 200, + scopedSlots: { customRender: 'deliverableTemplate' } } ] } @@ -982,6 +991,7 @@ let query = { id: id } + this.dataList = [] getAction('/project/projectCertificationInventoryEO/connectPlatform', query).then((res) => { if (res.success) { this.dataList = res.result || [] @@ -1181,6 +1191,9 @@ this.handleInput('dataList.' + index + '.dutyTerritory') this.queryPersonByProject(this.formInline.dataList[index].dutyTerritory.join(','), index) }, + down(id, name) { + downloadFile('/sys/common/downLoadFile', name, { id: id }) + }, queryPersonByProject(row, index) { let query = { projectId: this.$route.query.id,