From 13bd646ebee9c3723e34bceb6e3d2afd84ed398e Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 26 一月 2024 19:02:37 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/mapper/LocMastMapper.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 1f8ee39..9fd1d06 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -13,7 +13,11 @@
 @Repository
 public interface LocMastMapper extends BaseMapper<LocMast> {
 
-    @Select("select distinct row1 from asr_loc_mast where crn_no = #{crnNo}")
+//    @Select("select distinct row1 from asr_loc_mast where crn_no = #{crnNo}")
+    @Select("select row1 from ( select distinct row1 from asr_loc_mast where crn_no = #{crnNo} ) a " +
+        "order by case row1 when 1 then 1 when 2 then 0 when 3 then 0 when 4 then 1 " +
+        "when 5 then 1 when 6 then 0 when 7 then 0 when 8 then 1 when 9 then 1 when 10 then 0 " +
+        "when 11 then 0 when 12 then 1 when 13 then 1 when 14 then 0 when 15 then 0 when 16 then 1 end desc,newid()")
     List<Integer> queryDistinctRow(@Param("crnNo")Integer crnNo);
 
     LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1);
@@ -28,4 +32,7 @@
 
     LocMast queryDemoLoc(@Param("crnNo") Integer crnNo);
 
+    @Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}")
+    Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);
+
 }

--
Gitblit v1.9.1