From 3c8343535bec2a53855956e25598e2271fc84c0d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期日, 07 七月 2024 10:28:21 +0800
Subject: [PATCH] 更新测试管理搜索功能

---
 src/main/resources/mapper/LocMastMapper.xml |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 243b9fa..fee4223 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -37,6 +37,8 @@
         <result column="fire_no" property="fireNo" />
         <result column="fire_status" property="fireStatus" />
         <result column="pack_status" property="packStatus" />
+        <result column="channel" property="channel" />
+        <result column="freeze" property="freeze" />
 
     </resultMap>
 
@@ -45,12 +47,55 @@
         from asr_loc_mast
         where row1=#{row}
         and loc_sts='O'
+        <choose>
+            <when test="locType1 != null">
+                and loc_type1 = #{locType1}
+            </when>
+            <otherwise>
+                and 1!=1
+            </otherwise>
+        </choose>
+        order by lev1 asc,bay1 asc
+    </select>
+
+    <select id="queryFreeLocMast1" resultMap="BaseResultMap">
+        select top 1 *
+        from asr_loc_mast
+        where row1=#{row}
+        and loc_sts='O'
+        and channel > 0
+        and channel &lt; #{channelMax}
+        <if test="locType1 != null">
+            and loc_type1 = #{locType1}
+        </if>
+        order by channel asc
+    </select>
+
+    <select id="queryFreeLocMast2" resultMap="BaseResultMap">
+        select top 1 *
+        from asr_loc_mast
+        where row1=#{row}
+        and loc_sts='O'
+        <if test="locType2 != null and locType2 != 0">
+            and loc_type2 = #{locType2}
+        </if>
         <if test="locType1 != null">
             and loc_type1 = #{locType1}
         </if>
         order by lev1 asc,bay1 asc
     </select>
 
+    <select id="queryFreeLocMastCount" resultType="int">
+        select count(1)
+        from asr_loc_mast
+        where row1=#{row}
+        and loc_sts='O'
+        and loc_type2 = #{locType2}
+        <if test="locType1 != null">
+            and loc_type1 = #{locType1}
+        </if>
+    </select>
+
     <select id="queryShallowLocFMast" resultMap="BaseResultMap">
         select * from asr_loc_mast
         where 1=1

--
Gitblit v1.9.1