From 80313593ea0f369d4ad6e28d5c9a1686817f7199 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 27 九月 2025 14:33:10 +0800
Subject: [PATCH] #websocket

---
 src/main/resources/mapper/WrkMastMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index e4b3d26..f00483e 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -71,9 +71,9 @@
         where wrk_sts=5
         or wrk_sts=20
         or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
-        or (wrk_sts=15 and dateadd(mi,15,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
-        or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
-        order by io_time,wrk_no asc
+        or (wrk_sts=15 and dateadd(mi,15,modi_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+        or (wrk_sts=15 and modi_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
+        order by modi_time,wrk_no asc
     </select>
 
 </mapper>

--
Gitblit v1.9.1