From 891adffdef204cc893e0eb5c018c935872013d3e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 5 Jul 2024 14:56:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=20=E4=BC=81=E4=B8=9A=E7=AB=AF=20=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/common/common/ProjectCommon.java |  4 ++
 .../common/mapper/xml/ProjectDetailMapper.xml | 45 +++++++++++++++++++
 .../PayCommonProjectController.java           | 22 +++++++++
 3 files changed, 71 insertions(+)

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}
             </if>
         </where>
+        <!-- 功能安全中心项目-->
+        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
+        <where>
+            <if test="projectId != null and projectId != ''">
+                AND g.id = #{projectId}
+            </if>
+        </where>
     </select>
     <select id="queryProjectList" resultType="com.jero.project.entity.PayCommonProject">
         <!-- 普通项目-->
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
index ed503de4..eee5b4a1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
@@ -559,6 +559,28 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 
 		 }
 
+		 // 功能安全中心项目资料
+		 if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE8)){
+			 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			 LambdaQueryWrapper<PayWorkingGroupDistributionRecord> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>();
+			 queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getProjectId,id);
+			 queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getContactsId,sysUser.getId());
+			 queryPayWorkingGroupDistributionRecord.groupBy(PayWorkingGroupDistributionRecord::getFileId);
+			 List<PayWorkingGroupDistributionRecord> listPayWorkingGroupDistributionRecord = payWorkingGroupDistributionRecordService.list(queryPayWorkingGroupDistributionRecord);
+			 if(!CollectionUtils.isEmpty(listPayWorkingGroupDistributionRecord)){
+				 StringBuilder sb = new StringBuilder();
+				 listPayWorkingGroupDistributionRecord.forEach(p->{
+					 sb.append(p.getFileId());
+					 if(listPayWorkingGroupDistributionRecord.indexOf(p) != (listPayWorkingGroupDistributionRecord.size() - 1)){
+						 sb.append(",");
+					 }
+				 });
+				 payCommonProject.setFiles(sb.toString());
+			 }
+
+
+		 }
+
 		 String strProject = JSON.toJSONString(payCommonProject);
 		 payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class);
 		 if(Objects.isNull(payCompanyCommonProject.getPaidAmount())){