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

平台件项目名称

Browse Source
This commit is contained in:
zhn
2023-10-20 16:53:41 +08:00
parent bb106f3f9d
commit 5e57cf894f
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+4 -4
View File
@@ -1140,7 +1140,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
param.put("cut",cut); param.put("cut",cut);
String targetMarket = getMarket(param, targetMarketList, projectLibraryBase); String targetMarket = getMarket(param, targetMarketList, projectLibraryBase);
//项目名称（功率-生产商-目标市场） //项目名称（功率-生产商-目标市场）
String projectName = projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarket; String projectName = projectLibraryBase.getPlatformType() + "-" + projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarket;
projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值 projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值
//平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值 //平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值
projectLibraryBase.setProjectName(projectName); projectLibraryBase.setProjectName(projectName);
@@ -1542,7 +1542,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
param.put("cut",cut); param.put("cut",cut);
String targetMarketTemp = getMarket(param, targetMarketList, projectLibraryBase); String targetMarketTemp = getMarket(param, targetMarketList, projectLibraryBase);
//项目名称（功率-生产商-目标市场） //项目名称（功率-生产商-目标市场）
String projectName = projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarketTemp; String projectName = projectLibraryBase.getPlatformType() + "-" + projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarketTemp;
projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值 projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值
//平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值 //平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值
projectLibraryBase.setProjectName(projectName); projectLibraryBase.setProjectName(projectName);
@@ -2499,9 +2499,9 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
+ "-" + projectVersion); + "-" + projectVersion);
}else{ }else{
//projectLibraryBase.getYearName()为空的时候代表为平台件数据 //projectLibraryBase.getYearName()为空的时候代表为平台件数据
projectLibraryBase.setProjectNameEn(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketEn); projectLibraryBase.setProjectNameEn(projectLibraryBase.getPlatformType() + "-" + projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketEn);
projectLibraryBase.setProjectNameCn(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketCn); projectLibraryBase.setProjectNameCn(projectLibraryBase.getPlatformType() + "-" + projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketCn);
} }
if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){ if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+2 -2
View File
@@ -1997,7 +1997,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
.filter(e -> certificationInventoryEOS.get(0).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList()); .filter(e -> certificationInventoryEOS.get(0).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
if(ObjectUtils.isNotEmpty(libraryBaseList)){ if(ObjectUtils.isNotEmpty(libraryBaseList)){
String dictItemText = DictItemUtil.getDictItemText(cut, libraryBaseList.get(0).getTargetMarket(), targetMarketList); String dictItemText = DictItemUtil.getDictItemText(cut, libraryBaseList.get(0).getTargetMarket(), targetMarketList);
String configItem = libraryBaseList.get(0).getPower()+"-"+libraryBaseList.get(0).getProducer()+"-"+dictItemText; String configItem = libraryBaseList.get(0).getPlatformType() + "-" + libraryBaseList.get(0).getPower()+"-"+libraryBaseList.get(0).getProducer()+"-"+dictItemText;
certificationInventoryEO.setConfigItem(configItem); certificationInventoryEO.setConfigItem(configItem);
// certificationInventoryEO.setConfigItem(libraryBaseList.get(0).getProjectNameId()); // certificationInventoryEO.setConfigItem(libraryBaseList.get(0).getProjectNameId());
@@ -7217,7 +7217,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
if(!libraryBaseList.isEmpty()){ if(!libraryBaseList.isEmpty()){
//配置项 //配置项
String dictItemText = DictItemUtil.getDictItemText(cut,libraryBaseList.get(0).getTargetMarket(),targetMarketList); String dictItemText = DictItemUtil.getDictItemText(cut,libraryBaseList.get(0).getTargetMarket(),targetMarketList);
configItemTemp = libraryBaseList.get(0).getPower() + "-" + libraryBaseList.get(0).getProducer() + "-" + dictItemText; configItemTemp = libraryBaseList.get(0).getPlatformType() + "-" + libraryBaseList.get(0).getPower() + "-" + libraryBaseList.get(0).getProducer() + "-" + dictItemText;
// configItemTemp = libraryBaseList.get(0).getProjectNameId(); // configItemTemp = libraryBaseList.get(0).getProjectNameId();
} }
//类别 //类别
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+1 -1
View File
@@ -12489,7 +12489,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(!collect.isEmpty()){ if(!collect.isEmpty()){
//目标市场 //目标市场
String targetMarket = DictItemUtil.getDictItemText(cut,collect.get(0).getTargetMarket(),targetMarketList); String targetMarket = DictItemUtil.getDictItemText(cut,collect.get(0).getTargetMarket(),targetMarketList);
String projectName = collect.get(0).getPower() + "-" + collect.get(0).getProducer() + "-" + targetMarket; String projectName = collect.get(0).getPlatformType() + "-" + collect.get(0).getPower() + "-" + collect.get(0).getProducer() + "-" + targetMarket;
inventoryEO.setProjectName(projectName); inventoryEO.setProjectName(projectName);
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+3 -3
View File
@@ -1313,7 +1313,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
+ "-" + projectLibraryBase.getYearName() + "-" + projectLibraryBase.getYearName()
+ "-" + targetMarket + "-" + projectVersion); + "-" + targetMarket + "-" + projectVersion);
}else{ }else{
projectLibraryBase.setProjectName(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarket); projectLibraryBase.setProjectName(projectLibraryBase.getPlatformType()+"-"+projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarket);
} }
} }
return records; return records;
@@ -3061,9 +3061,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
+ "-" + projectVersion); + "-" + projectVersion);
}else{ }else{
//projectLibraryBase.getYearName()为空时代表该数据为平台件数据 //projectLibraryBase.getYearName()为空时代表该数据为平台件数据
projectLibraryBase.setProjectNameEn(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketEn); projectLibraryBase.setProjectNameEn(projectLibraryBase.getPlatformType()+"-"+projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketEn);
projectLibraryBase.setProjectNameCn(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketCn); projectLibraryBase.setProjectNameCn(projectLibraryBase.getPlatformType()+"-"+projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketCn);
} }
if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){ if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){