From f20fad8125774e487e133e909b323b43bd11db24 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 03 三月 2025 20:40:15 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
business/src/main/resources/mapper/ProjectProcessMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml
index e4f8bdc..5008916 100644
--- a/business/src/main/resources/mapper/ProjectProcessMapper.xml
+++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml
@@ -77,6 +77,8 @@
<result column="parent_id" property="parent" />
<result column="project_owner_unit_name" property="projectOwnerUnitName" />
<result column="competent_department_name" property="competentDepartmentName" />
+ <result column="process_ins_id" property="processInsId" />
+ <result column="process_def_id" property="processDefId" />
</resultMap>
<select id="getProjectEngineeringList" parameterType="string" resultMap="EngineeringMap">
@@ -111,9 +113,11 @@
SELECT
TT.id, TT.project_info_id, TT.project_name, TT.project_type, TT.investment_amount, TT.status, TT.unit, TT.department, TT.parent_id, TT.year, TT.gmt_create,
(SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TT.unit) AS project_owner_unit_name,
- (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TT.department) AS competent_department_name
+ (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TT.department) AS competent_department_name,
+ TPP.process_ins_id, TPP.process_def_id
FROM
temp_table TT
+ LEFT JOIN t_project_process TPP ON TPP.project_id = TT.id AND TPP.deleted = 0 AND TPP.project_type = 'ENGINEERING'
ORDER BY
TT.gmt_create DESC
</select>
@@ -169,7 +173,9 @@
<select id="getNormalInsIds" resultType="string">
- SELECT TPP.process_ins_id FROM t_project_info TPI INNER JOIN t_project_process TPP ON TPI.id = TPP.project_id AND TPI.deleted = 0
+ SELECT TPP.process_ins_id FROM t_project_info TPI INNER JOIN t_project_process TPP ON TPI.id = TPP.project_id AND TPI.deleted = 0 AND TPP.project_type = 'PROJECT'
+ UNION ALL
+ SELECT TPP.process_ins_id FROM t_project_engineering TPE INNER JOIN t_project_process TPP ON TPE.id = TPP.project_id AND TPE.deleted = 0 AND TPP.project_type = 'ENGINEERING'
</select>
</mapper>
--
Gitblit v1.8.0