From 38d7ec7ea772a6f48a0409f2fcbbcde05364ec7b Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期五, 27 八月 2021 09:46:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmasrs' into xgmasrs
---
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index f3ef02c..ee48a59 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -70,7 +70,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) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= 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