From 9e28453dba6ecf93c6c2234ba38def7c41cf12f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 18:25:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/ProjectProcessMapper.xml | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml
index 0b2fc68..37c80a6 100644
--- a/business/src/main/resources/mapper/ProjectProcessMapper.xml
+++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml
@@ -14,11 +14,10 @@
<result column="invest_type" property="investType" />
<result column="project_phase" property="projectPhase" />
<result column="tag" property="tag" />
- <result column="competent_department" property="competentDepartment" />
+<!-- <result column="competent_department" property="competentDepartment" />-->
<result column="area_code" property="areaCode" />
- <result column="management_centralization" property="managementCentralization" />
+<!-- <result column="management_centralization" property="managementCentralization" />-->
<result column="project_approval_type" property="projectApprovalType" />
- <result column="investment_catalogue" property="investmentCatalogue" />
<result column="importance_type" property="importanceType" />
<result column="year" property="year" />
<result column="year_invest_amount" property="yearInvestAmount" />
@@ -38,12 +37,10 @@
<result column="gmt_update_time" property="gmtUpdateTime" />
<result column="update_by" property="updateBy" />
<result column="create_by" property="createBy" />
- <result column="flowable_process_id" property="flowableProcessId" />
+ <result column="process_def_id" property="processDefId" />
+ <result column="process_ins_id" property="processInsId" />
<!-- <association property="id" column=""-->
</resultMap>
-
-
-
@@ -51,7 +48,7 @@
<select id="getById" resultMap="BaseResultMap">
SELECT
TPP.project_id,
- TPP.flowable_process_id,
+ TPP.process_def_id,
TPP.id
FROM
t_project_process TPP
@@ -63,10 +60,12 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT
PI.*,
- TPP.flowable_process_id
+ TPP.process_def_id,
+ TPP.process_ins_id
FROM
- t_project_process TPP
- INNER JOIN t_project_info PI ON TPP.project_id = PI.id AND TPP.deleted = 0 AND PI.deleted = 0
+ t_project_info PI
+ LEFT JOIN t_project_process TPP ON TPP.project_id = PI.id AND TPP.deleted = 0 AND PI.deleted = 0
+ LEFT JOIN sys_dept d ON d.dept_id = PI.project_owner_unit
<where>
<if test="query.projectName != null and query.projectName != ''">
AND PI.project_name like concat('%', #{query.projectName}, '%')
@@ -74,8 +73,18 @@
<if test="query.projectCode != null and query.projectCode != ''">
AND PI.project_code like concat('%', #{query.projectCode}, '%')
</if>
+ ${query.params.dataScope}
</where>
</select>
+
+ <select id="getProjectInfo" parameterType="string" resultType="com.ycl.domain.entity.ProjectInfo">
+ SELECT
+ PI.id, PI.project_name
+ FROM
+ t_project_process PP
+ INNER JOIN t_project_info PI ON PP.project_id = PI.id AND PI.deleted = 0 AND PP.process_ins_id = #{processInsId}
+ </select>
+
</mapper>
--
Gitblit v1.8.0