Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT

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`;
+
+

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;
 }

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<Proj
 					for (int i = 1; i < projectCertificationInventoryEOList.size(); i++) {
 						ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = new ProjectCertificationInventoryEO();
 						BeanUtils.copyProperties(projectCertificationInventoryEO,projectCertificationInventoryEOTemp);
+						projectCertificationInventoryEOTemp.setPlatformCertificationInventoryId(projectCertificationInventoryEOList.get(i).getId());
 						projectCertificationInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
 						list.add(projectCertificationInventoryEOTemp);
 
@@ -7475,23 +7476,29 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			return new ArrayList<>();
 		}
 		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<OSSFile> 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<SysCategory> categoryList = sysCategoryService.list();
 			String name = getTreeName(cut, categoryList, Arrays.asList(deliverableType.split(",")));
-			certificationInventoryEO.setDeliverableTypeName(name);
+			certificationInventoryEOTemp.setDeliverableTypeName(name);
 		}
+
+
+		//平台件认证清单对应的法规
+		List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseMapper.queryById(certificationInventoryEOTemp.getProjectLibraryId());
 		//平台件项目名称
-		String projectLibraryId = certificationInventoryEO.getProjectLibraryId();
-		List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseMapper.queryById(projectLibraryId);
 		if(ObjectUtils.isNotEmpty(projectLibraryBaseList)){
 			ProjectLibraryBase projectLibraryBase = projectLibraryBaseList.get(0);
 			//目标市场 英文
@@ -7500,10 +7507,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			paramEn.put("cut",cut);
 			String targetMarket = projectLibraryBaseServiceImpl.getMarket(paramEn, targetMarketList, projectLibraryBase);
 			String projectName = projectLibraryBase.getPlatformType()+"-"+projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarket;
-			certificationInventoryEO.setProjectName(projectName);
+			certificationInventoryEOTemp.setProjectName(projectName);
 		}
 		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
-		projectCertificationInventoryEOList.add(certificationInventoryEO);
+		projectCertificationInventoryEOList.add(certificationInventoryEOTemp);
 		return projectCertificationInventoryEOList;
 	}
 

jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue

@@ -692,12 +692,12 @@
             </a-row>
 
 
-            <div class="header-text-text">
+            <div class="header-text-text" v-if='dataList && dataList.length > 0'>
               &nbsp;{{$t('PlatformInformation')}}
             </div>
-            <!--               v-if='dataList && dataList.length > 0'-->
-            <a-table
 
+            <a-table
+              v-if='dataList && dataList.length > 0'
               :components="drag(columns,'columns')"
               :columns="columns"
               rowKey="id"
@@ -705,6 +705,14 @@
               :data-source="dataList"
               :pagination="false"
               :loading="loading">
+             <span slot="deliverableTemplate"
+                   :title="record.deliverableTemplateName"
+                   slot-scope="text,record">
+              <a style='color:#00B3BE;cursor: pointer'
+                 @click="down(record.deliverableTemplate,record.deliverableTemplateName)">
+                    {{record.deliverableTemplateName}}
+              </a>
+            </span>
             </a-table>
           </div>
           <!--        <a-row :gutter="24">-->
@@ -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,