From 2bd22e9a59ba5a5ce6935adf9f9bbb02ed171776 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 14 十一月 2022 10:12:40 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/WrkChargeMapper.xml |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/WrkChargeMapper.xml b/src/main/resources/mapper/WrkChargeMapper.xml
index 5898ef3..5ce83e6 100644
--- a/src/main/resources/mapper/WrkChargeMapper.xml
+++ b/src/main/resources/mapper/WrkChargeMapper.xml
@@ -10,6 +10,7 @@
         <result column="io_type" property="ioType" />
         <result column="crn_no" property="crnNo" />
         <result column="ste_no" property="steNo" />
+        <result column="charge" property="charge" />
         <result column="out_most" property="outMost" />
         <result column="io_pri" property="ioPri" />
         <result column="loc_no" property="locNo" />
@@ -29,12 +30,31 @@
 
     </resultMap>
 
-    <select id="selectWorking" resultMap="BaseResultMap">
+    <select id="selectWorkingOfCharge" resultMap="BaseResultMap">
         select top 1 *
         from asr_wrk_charge
         where 1=1
-        and ste_no = #{steNo}
-        and wrk_sts != 28
+        <if test="steNo != null">
+            and ste_no = #{steNo}
+        </if>
+        <if test="charge != null">
+            and charge = #{charge}
+        </if>
+        and wrk_sts &lt; 30
+        and memo = 'charge'
+        order by appe_time, io_pri desc
+    </select>
+
+    <select id="selectWorkingOfReset" resultMap="BaseResultMap">
+        select top 1 *
+        from asr_wrk_charge
+        where 1=1
+        <if test="steNo != null">
+            and ste_no = #{steNo}
+        </if>
+        and wrk_sts &lt; 47
+        and memo = 'reset'
+        order by appe_time, io_pri desc
     </select>
 
 </mapper>

--
Gitblit v1.9.1