From 31cba27f3f8ef2cdb02f1fa0d3df7b41605a3ba5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 24 二月 2025 14:26:46 +0800
Subject: [PATCH] 编辑项目其它信息项目id为空bug

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

diff --git a/flowable/src/main/resources/mapper/ProcessLogMapper.xml b/flowable/src/main/resources/mapper/ProcessLogMapper.xml
index 78dc89a..1c6c529 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,21 +59,34 @@
     <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
             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