From 5e57cf894f0b9f8bdfb5a7c201550b0aef6bbf69 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 20 Oct 2023 16:53:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PlatformProjectLibraryBaseServiceImpl.java       | 8 ++++----
 .../impl/ProjectCertificationInventoryEOServiceImpl.java  | 4 ++--
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java   | 2 +-
 .../service/impl/ProjectLibraryBaseServiceImpl.java       | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index 19922b462..46be7e98a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -1140,7 +1140,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			param.put("cut",cut);
 			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);//原设计平台件项目名称去这个字段值
 			//平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值
 			projectLibraryBase.setProjectName(projectName);
@@ -1542,7 +1542,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			param.put("cut",cut);
 			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);//原设计平台件项目名称去这个字段值
 			//平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值
 			projectLibraryBase.setProjectName(projectName);
@@ -2499,9 +2499,9 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 							+ "-" + projectVersion);
 				}else{
 					//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())){
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 ca501a5ba..56c29de5b 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
@@ -1997,7 +1997,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 							.filter(e -> certificationInventoryEOS.get(0).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
 					if(ObjectUtils.isNotEmpty(libraryBaseList)){
 						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(libraryBaseList.get(0).getProjectNameId());
@@ -7217,7 +7217,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				if(!libraryBaseList.isEmpty()){
 					//配置项
 					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();
 				}
 				//类别
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index bec6869df..d7b94aa97 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -12489,7 +12489,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						if(!collect.isEmpty()){
 							//目标市场
 							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);
 						}
 					}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 40a6bfd2a..dd9a6d384 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1313,7 +1313,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 						+ "-" + projectLibraryBase.getYearName()
 						+ "-" + targetMarket + "-" + projectVersion);
 			}else{
-				projectLibraryBase.setProjectName(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarket);
+				projectLibraryBase.setProjectName(projectLibraryBase.getPlatformType()+"-"+projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarket);
 			}
 		}
 		return records;
@@ -3061,9 +3061,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 							+ "-" + projectVersion);
 				}else{
 					//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())){