From a3c70ef5ed3c18209b37ba01a8ab3eb0eea0d7cb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 12 十二月 2023 16:49:52 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/TaskWrkMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 103e228..ddbeb5a 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -118,12 +118,19 @@
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from dbo.wcs_task_wrk
where 1=1
- and (status=3 or status=4)
+ and ((wrk_sts=14 and status=5) or status=4 or (wrk_sts=4 and status=5))
order by io_pri desc,create_time,wrk_no ASC
</select>
<insert id="saveToHistory">
- insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo} and (status=3 or status=4)
+ insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo} and (status=5 or status=4)
</insert>
+ <select id="selectWorkingTask" resultMap="BaseResultMap">
+ select * from dbo.wcs_task_wrk
+ where (wrk_sts=3 and io_type = 1)
+ or (wrk_sts=12 and io_type = 2)
+ order by io_pri desc,create_time,wrk_no ASC
+ </select>
+
</mapper>
--
Gitblit v1.9.1