From a19c350a3f55762dc93246b024c3cf2ff852bded Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期三, 15 三月 2023 10:49:54 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +- src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java index 8ac90e4..9443bfe 100644 --- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java +++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java @@ -109,7 +109,7 @@ Integer selectExistInEmpty(); - @Select("select * from where crn_no=#{crnNo} and io_type>=100 order by appe_time") + @Select("select * from where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC") public List<WrkMast> selectWrkIoType(@Param("crnNo") Integer crnNo); diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index bcb4ae6..34b993d 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -729,7 +729,7 @@ wrkMasts.add(wrkMast); count++; if(count==0) continue; - if(wrkMast.getWrkDate().getTime()<wrkMasts.get(i).getWrkDate().getTime()) + if(wrkMast.getWrkDate().getTime()<wrkMasts.get(i).getWrkDate().getTime() && wrkMast.getIoPri()<wrkMasts.get(i).getIoPri()) i=count; crnStn1=crnStn; } -- Gitblit v1.9.1