From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index d7f0f90..b263c53 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -13,12 +13,12 @@
@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);
+ "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);
@@ -37,6 +37,7 @@
LocMast selectByLocNo(String locNo);
- List<LocMast> selectLocByLev(@Param("lev")Integer lev);
+ List<LocMast> selectLocByLev(@Param("lev") Integer lev);
+
}
--
Gitblit v1.9.1