From 06749c4f89adbae1581f142d5b73576ecf6136d8 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 26 十二月 2024 17:57:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/ProjectProcessMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml
index 5ce1bb6..7fe3996 100644
--- a/business/src/main/resources/mapper/ProjectProcessMapper.xml
+++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml
@@ -37,7 +37,8 @@
<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>
@@ -47,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
@@ -59,7 +60,8 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT
PI.*,
- TPP.flowable_process_id
+ TPP.process_def_id,
+ TPP.process_ins_id
FROM
t_project_info PI
LEFT JOIN t_project_process TPP ON TPP.project_id = PI.id AND TPP.deleted = 0 AND PI.deleted = 0
--
Gitblit v1.8.0