WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gaosong
2023-12-07 17:59:50 +08:00
parent b4b3f57f02 bcaf4c9871
commit b2a1e3f883
4 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
+3
View File
@@ -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
+15 -8
View File
@@ -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;
}