From 001876ed79400dcf36e0558c1e744e0693ee9020 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 04 三月 2025 10:53:21 +0800
Subject: [PATCH] 流程日志bug、流程推进全部事项分页bug
---
flowable/src/main/resources/mapper/ProcessLogMapper.xml | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/flowable/src/main/resources/mapper/ProcessLogMapper.xml b/flowable/src/main/resources/mapper/ProcessLogMapper.xml
index a377afe..6319ad0 100644
--- a/flowable/src/main/resources/mapper/ProcessLogMapper.xml
+++ b/flowable/src/main/resources/mapper/ProcessLogMapper.xml
@@ -5,10 +5,13 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.domain.vo.ProcessLogVO">
<result column="task_id" property="taskId" />
- <result column="event_type" property="eventType" />
+ <result column="task_name" property="taskName" />
+ <result column="event_type" property="eventType" typeHandler="com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler"/>
<result column="project_id" property="projectId" />
- <result column="flow_ins_id" property="flowInsId" />
+ <result column="process_ins_id" property="processInsId" />
<result column="user_id" property="userId" />
+ <result column="nick_name" property="nickName" />
+ <result column="gmt_create" property="gmtCreate" />
<result column="event_data_json" property="eventDataJson" />
</resultMap>
@@ -21,9 +24,10 @@
<select id="getById" resultMap="BaseResultMap">
SELECT
TFL.task_id,
+ TFL.task_name,
TFL.event_type,
TFL.project_id,
- TFL.flow_ins_id,
+ TFL.process_ins_id,
TFL.user_id,
TFL.event_data_json,
TFL.id
@@ -37,11 +41,13 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT
TFL.task_id,
+ TFL.task_name,
TFL.event_type,
TFL.project_id,
- TFL.flow_ins_id,
+ TFL.process_ins_id,
TFL.user_id,
TFL.event_data_json,
+ TFL.gmt_create,
TFL.id
FROM
t_process_log TFL
@@ -49,4 +55,40 @@
TFL.deleted = 0
</select>
+
+ <select id="projectProcessLogPage" resultMap="BaseResultMap">
+ SELECT
+ TFL.task_id,
+ TFL.task_name,
+ TFL.event_type,
+ TFL.project_id,
+ TFL.process_ins_id,
+ TFL.user_id,
+ CONCAT(SU.nick_name, '(',COALESCE(SD.dept_name, '鏃犻儴闂�'), ')') as nick_name,
+ TFL.event_data_json,
+ TFL.gmt_create,
+ TFL.id
+ FROM
+ t_process_log TFL
+ LEFT JOIN sys_user SU ON SU.user_id = TFL.user_id
+ LEFT JOIN sys_dept SD ON SU.dept_id = SD.dept_id
+ WHERE
+ TFL.deleted = 0 AND TFL.process_ins_id = #{query.processInsId}
+ <if test="query.taskId != null and query.taskId != ''">AND TFL.task_id = #{query.taskId}</if>
+ <if test="query.projectId != null and query.projectId != ''">AND TFL.project_id = #{query.projectId}</if>
+ ORDER BY
+ TFL.gmt_create DESC
+ </select>
+
+ <select id="getAllHangup" resultType="java.lang.String">
+ SELECT task_id
+ FROM (
+ SELECT task_id,
+ COUNT(*) AS num
+ FROM t_process_log
+ WHERE task_id IS NOT NULL
+ GROUP BY task_id
+ HAVING MOD(num, 2) != 0
+ ) AS t;
+ </select>
</mapper>
--
Gitblit v1.8.0