From 478e91d159240d6c23f7d1e660fcc7b04b413f09 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 13 Oct 2023 17:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=92=8C=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?-=E5=8F=91=E8=B5=B7=E4=BB=BB=E5=8A=A1=E6=97=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformProjectCertificationInventoryEOServiceImpl.java  | 2 +-
 .../service/impl/PlatformProjectLibraryBaseServiceImpl.java  | 5 +++++
 .../modules/project/mapper/xml/ProjectLibraryBaseMapper.xml  | 1 -
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java  | 5 +++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index 3c6a98c03..e01abb68b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -3288,7 +3288,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 						templateVariableMap.put("projectNameEn",PRN_EN);
 						templateVariableMap.put("standName",standName);
 						templateVariableMap.put("itemName",itemName);
-						templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
+						templateVariableMap.put("Initiator",projectLibraryBase.getRegulationOwnerIdName());
 						templateVariableMap.put("endTime",DateUtils.formatDate(taskConfirmEndTime));
 						templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
 						templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
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 5fe52592d..2f0adfbce 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
@@ -2468,6 +2468,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 							+ "-" + projectLibraryBase.getYearName()
 							+ "-" + targetMarketCn
 							+ "-" + projectVersion);
+				}else{
+					//projectLibraryBase.getYearName()为空的时候代表为平台件数据
+					projectLibraryBase.setProjectNameEn(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketEn);
+
+					projectLibraryBase.setProjectNameCn(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/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index 82c3eb811..5419e9765 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -290,7 +290,6 @@
     <select id="queryById" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
         <include refid="select_item"/>
         <where>
-            plb.platform is null
             <if test="id != null and id != '' ">
                 and plb.id=#{id}
             </if>
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 f268989f2..cc0f6253d 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
@@ -2778,6 +2778,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 							+ "-" + projectLibraryBase.getYearName()
 							+ "-" + targetMarketCn
 							+ "-" + projectVersion);
+				}else{
+					//projectLibraryBase.getYearName()为空时代表该数据为平台件数据
+					projectLibraryBase.setProjectNameEn(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketEn);
+
+					projectLibraryBase.setProjectNameCn(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketCn);
 				}
 
 				if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){