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; } 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..3e7da8e95 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')}}
- - + + + {{record.deliverableTemplateName}} + +
@@ -862,10 +870,11 @@ }, { title: this.$t('deliverableTemplate'), - dataIndex: 'deliverableTemplate', + 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,