From c6ab1a516d8398de65512fcd380d89e46ec8e430 Mon Sep 17 00:00:00 2001 From: mrzhssss <pro6@qq.com> Date: 星期五, 27 五月 2022 15:31:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jkasrs' into jkasrs --- src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java index 8d9e59c..dd349bd 100644 --- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java +++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java @@ -5,8 +5,15 @@ import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; +import java.util.List; + @Mapper @Repository public interface WrkMastMapper extends BaseMapper<WrkMast> { +// @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no") + List<WrkMast> selectToBeCompleteData(); + + List<WrkMast> selectToBeHistoryData(); + } -- Gitblit v1.9.1