From 3a834dba6a17015f4403be904a6145817e136760 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 05 九月 2025 09:16:35 +0800
Subject: [PATCH] 转历史,判断工作档状态

---
 src/main/resources/mapper/TaskWrkMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 7b4bd64..1efa21d 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -132,7 +132,7 @@
     <select id="selectToBeHistoryData" resultMap="BaseResultMap">
         select * from dbo.wcs_task_wrk
         where 1=1
-        and ((wrk_sts=14 and status=5 and dateadd(ss,10,complete_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp)) or status=7 or status=4 or status=5)
+        and ((wrk_sts=14 and status=5 and dateadd(ss,10,complete_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp)) or status=7 or status=4 or (wrk_sts=4 and status=5))
         order by io_pri desc,create_time,wrk_no ASC
     </select>
 

--
Gitblit v1.9.1