diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java index eed57f05..a6070c3d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java @@ -41,6 +41,10 @@ public class ProjectCommon { * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目,6:证书,7: 起草组项目) */ public final static String PROJECT_TYPE7 = "7"; + /** + * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目,6:证书,7: 起草组项目,8: 功能安全中心项目) + */ + public final static String PROJECT_TYPE8 = "8"; /** * 来源(1:收入合同,2:打包管理) */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml index 094bae6c..385f6e80 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml @@ -133,6 +133,51 @@ AND ppc.id = #{projectId} + + UNION ALL + SELECT + g.id, + g.project_name, + '', + g.principal_id, + su.realname, + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + g.create_time, + 9, + '', + '', + g.remarks, + '', + '', + '', + '', + '', + '', + '', + '', + g.mission_and_objectives, + '', + '', + '', + '' + FROM + pay_functional_safety_center g + LEFT JOIN + sys_user su ON g.principal_id = su.id + + + AND g.id = #{projectId} + +