From 3cbfc1624bb7a23a4dfa62ec4558578b00be56b3 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 04 三月 2025 21:59:55 +0800
Subject: [PATCH] 流程日志查询bug、督办日志bug

---
 flowable/src/main/resources/mapper/ProcessCodingMapper.xml |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/flowable/src/main/resources/mapper/ProcessCodingMapper.xml b/flowable/src/main/resources/mapper/ProcessCodingMapper.xml
index c87910b..ce66ff6 100644
--- a/flowable/src/main/resources/mapper/ProcessCodingMapper.xml
+++ b/flowable/src/main/resources/mapper/ProcessCodingMapper.xml
@@ -10,7 +10,9 @@
         <result column="process_ins_id" property="processInsId" />
         <result column="yellow_time" property="yellowTime" />
         <result column="red_time" property="redTime" />
+        <result column="overtime" property="overtime" />
         <result column="status" property="status" />
+        <result column="overtime_status" property="overtimeStatus" />
     </resultMap>
 
 
@@ -22,7 +24,9 @@
             TPC.process_ins_id,
             TPC.yellow_time,
             TPC.red_time,
+            TPC.overtime,
             TPC.status,
+            TPC.overtime_status,
             TPC.id
         FROM
             t_process_coding TPC
@@ -39,12 +43,17 @@
             TPC.process_ins_id,
             TPC.yellow_time,
             TPC.red_time,
+            TPC.overtime,
             TPC.status,
+            TPC.overtime_status,
             TPC.id
         FROM
             t_process_coding TPC
         WHERE
             TPC.deleted = 0
+    </select>
+    <select id="findByTaskId" resultType="com.ycl.domain.entity.ProcessCoding">
+        SELECT * from t_process_coding where task_id = #{taskId}
     </select>
 
     <!-- 鑷畾涔夋壒閲忔洿鏂�,浣跨敤鍓嶅垽鏂璴ist鏄惁涓虹┖ 杞崲涓簊ql
@@ -63,6 +72,16 @@
                     when id=#{item.id} then #{item.status}
                 </foreach>
             </trim>
+            <trim prefix="overtime_status =case" suffix="end,"><!-- 鏋勯�燾ase璇硶 鏈熬鍔犱笂end锛屽鏋滈渶瑕佹洿鏂板涓瓧娈靛鍒惰繖涓猼rim -->
+                <foreach collection="list" item="item">
+                    when id=#{item.id} then #{item.overtimeStatus}
+                </foreach>
+            </trim>
+            <trim prefix="start_task_time =case" suffix="end,"><!-- 鏋勯�燾ase璇硶 鏈熬鍔犱笂end锛屽鏋滈渶瑕佹洿鏂板涓瓧娈靛鍒惰繖涓猼rim -->
+                <foreach collection="list" item="item">
+                    when id=#{item.id} then #{item.startTaskTime}
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">

--
Gitblit v1.8.0