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-13 17:15:41 +08:00
parent f90e243074
commit 478e91d159
4 changed files with 11 additions and 2 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/PlatformProjectCertificationInventoryEOServiceImpl.java
+1 -1
View File
@@ -3288,7 +3288,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
templateVariableMap.put("projectNameEn",PRN_EN); templateVariableMap.put("projectNameEn",PRN_EN);
templateVariableMap.put("standName",standName); templateVariableMap.put("standName",standName);
templateVariableMap.put("itemName",itemName); templateVariableMap.put("itemName",itemName);
templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName()); templateVariableMap.put("Initiator",projectLibraryBase.getRegulationOwnerIdName());
templateVariableMap.put("endTime",DateUtils.formatDate(taskConfirmEndTime)); templateVariableMap.put("endTime",DateUtils.formatDate(taskConfirmEndTime));
templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN); templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN); templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+5
View File
@@ -2468,6 +2468,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
+ "-" + projectLibraryBase.getYearName() + "-" + projectLibraryBase.getYearName()
+ "-" + targetMarketCn + "-" + targetMarketCn
+ "-" + projectVersion); + "-" + projectVersion);
}else{
//projectLibraryBase.getYearName()为空的时候代表为平台件数据
projectLibraryBase.setProjectNameEn(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketEn);
projectLibraryBase.setProjectNameCn(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/mapper/xml/ProjectLibraryBaseMapper.xml
-1
View File
@@ -290,7 +290,6 @@
<select id="queryById" resultType="com.jero.modules.project.entity.ProjectLibraryBase"> <select id="queryById" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
<include refid="select_item"/> <include refid="select_item"/>
<where> <where>
plb.platform is null
<if test="id != null and id != '' "> <if test="id != null and id != '' ">
and plb.id=#{id} and plb.id=#{id}
</if> </if>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+5
View File
@@ -2778,6 +2778,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
+ "-" + projectLibraryBase.getYearName() + "-" + projectLibraryBase.getYearName()
+ "-" + targetMarketCn + "-" + targetMarketCn
+ "-" + projectVersion); + "-" + projectVersion);
}else{
//projectLibraryBase.getYearName()为空时代表该数据为平台件数据
projectLibraryBase.setProjectNameEn(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketEn);
projectLibraryBase.setProjectNameCn(projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarketCn);
} }
if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){ if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){