From e86b16a668d88ceb4399d083f3e31cb32c233611 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 3 Jun 2024 13:00:23 +0800
Subject: [PATCH] md

---
 .../mapper/EmisTmsScanRecordMapper.xml        | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index d9e22a3ca..ebc968f11 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -182,14 +182,12 @@
 
 
 
-
-
     <select id="selectEmisTmsScanRecordList" parameterType="EmisTmsScanRecord" resultMap="EmisTmsScanRecordResult">
         <include refid="selectEmisTmsScanRecordVo"/>
         <where>
             <if test="id != null "> and id = #{id}</if>
-            <if test="billCode != null  and billCode != '' " > and bill_code=#{billCode}</if>
-            <if test="orderSn != null  and orderSn != ''  "> and order_sn like concat(#{orderSn}, '%')</if>
+            <if test="orderSn != null  and orderSn != ''"> and FIND_IN_SET(`order_sn`,#{orderSn}) </if>
+            <if test="billCode != null  and billCode != ''"> and FIND_IN_SET(`bill_code`,#{billCode}) </if>
             <if test="scanType != null  and scanType != ''"> and scan_type=#{scanType}</if>
             <if test="preOrNextStation != null  and preOrNextStation != ''"> and pre_or_next_station like concat('%', #{preOrNextStation}, '%')</if>
             <if test="preOrNextStationCode != null  and preOrNextStationCode != ''"> and pre_or_next_station_code=#{preOrNextStationCode}</if>
@@ -260,9 +258,23 @@
             </if>
 
 
-
         </where>
-        order by create_time desc
+        ORDER BY
+        <if test="params.orderSnSortList != null and params.orderSnSortList.size >0  ">
+            FIELD
+            <foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")">
+                #{item}
+            </foreach>
+            ,
+        </if>
+        <if test="params.billCodeSortList != null and params.billCodeSortList.size >0  ">
+            FIELD
+            <foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")">
+                #{item}
+            </foreach>
+            ,
+        </if>
+        create_time desc
     </select>
 
 <!--     and params.queryType = 2-->