From 6c00757e63a69b8d527f1b978859b17c8db136f6 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 17 十二月 2025 15:00:16 +0800
Subject: [PATCH] #1
---
src/main/resources/mapper/WrkMastMapper.xml | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 7875a50..9a7ddfe 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -72,13 +72,28 @@
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from asr_wrk_mast
- where wrk_sts=5
- or wrk_sts=44
- or wrk_sts=64
- or (wrk_sts=57 and wrk_no not in (select wrk_no from asr_bas_devp))
- 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 crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
+ where 1=1
+ and (
+ (
+ 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 crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
+ )
+ and log_mk = 'Y'
+ ) or (
+ wrk_sts=44
+ or wrk_sts=64
+ or (wrk_sts=57 and wrk_no not in (select wrk_no from asr_bas_devp))
+ )
+ order by io_time,wrk_no asc
+ </select>
+
+ <select id="selectToBeHistoryDataV1" resultMap="BaseResultMap">
+ select * from asr_wrk_mast
+ where 1=1
+ and (wrk_sts=5 or wrk_sts=15 or io_type = 107 or (wrk_sts!=5 and (io_type = 53 or io_type = 57)))
+ and log_mk != 'Y'
order by io_time,wrk_no asc
</select>
--
Gitblit v1.9.1