From 11e8a8f6e8cc27514447a49606842b890cdadba8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 14 二月 2025 14:43:56 +0800
Subject: [PATCH] 流程日志查询完善

---
 flowable/src/main/resources/mapper/ProcessLogMapper.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/flowable/src/main/resources/mapper/ProcessLogMapper.xml b/flowable/src/main/resources/mapper/ProcessLogMapper.xml
index 78dc89a..6dd004e 100644
--- a/flowable/src/main/resources/mapper/ProcessLogMapper.xml
+++ b/flowable/src/main/resources/mapper/ProcessLogMapper.xml
@@ -5,6 +5,7 @@
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.ycl.domain.vo.ProcessLogVO">
         <result column="task_id" property="taskId" />
+        <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="process_ins_id" property="processInsId" />
@@ -23,6 +24,7 @@
     <select id="getById" resultMap="BaseResultMap">
         SELECT
             TFL.task_id,
+            TFL.task_name,
             TFL.event_type,
             TFL.project_id,
             TFL.process_ins_id,
@@ -39,6 +41,7 @@
     <select id="getPage" resultMap="BaseResultMap">
         SELECT
             TFL.task_id,
+            TFL.task_name,
             TFL.event_type,
             TFL.project_id,
             TFL.process_ins_id,
@@ -56,17 +59,19 @@
     <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,
-            SU.nick_name,
+            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.project_id = #{query.projectId} AND TFL.process_ins_id = #{query.processInsId}
         ORDER BY

--
Gitblit v1.8.0