From 9609e2b096fac01efaa56958042b4175bbc25d5b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 18 十一月 2025 14:36:45 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index b99fd2d..afa1793 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -4,7 +4,9 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMast">
-        <id column="wrk_no" property="wrkNo" />
+        <id column="id" property="id" />
+        <result column="wrk_no" property="wrkNo" />
+        <result column="task_type" property="taskType" />
         <result column="inv_wh" property="invWh" />
         <result column="ymd" property="ymd" />
         <result column="mk" property="mk" />
@@ -70,7 +72,7 @@
         select * from asr_wrk_mast
         where wrk_sts=5
         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 dateadd(mi,3,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
     </select>

--
Gitblit v1.9.1