From baeea90f1daa740835408e6fcd46c55b6258de46 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 31 Mar 2025 10:37:37 +0800
Subject: [PATCH] md

---
 .../resources/mapper/EmisTmsScanRecordMapper.xml     | 12 ++++++++++--
 .../resources/mapper/EmisWaybillAttachmentMapper.xml |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 3c6facb48..d87fd7f77 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -280,8 +280,16 @@
             del_flag='0'
 
             <if test="id != null "> and id = #{id}</if>
-            <if test="orderSn != null  and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
-            <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or FIND_IN_SET(`main_bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
+            <if test="orderSn != null  and orderSn != ''">
+              and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') )
+            </if>
+            <if test="billCode != null  and billCode != ''">
+             <!-- and ( FIND_IN_SET(`bill_code`,#{billCode}) or FIND_IN_SET(`main_bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  -->
+             and bill_code in
+                 <foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+             </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>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
index 9ae4e7d96..20fb46ccb 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
@@ -28,7 +28,7 @@
             del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="waybillId != null "> and waybill_id = #{waybillId}</if>
-            <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
+            <if test="billCode != null  and billCode != ''"> and `bill_code` ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
             <if test="attachType != null  and attachType != ''"> and FIND_IN_SET(attach_type,#{attachType})</if>
             <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
             <if test="fileUrl != null  and fileUrl != ''"> and file_url like concat('%', #{fileUrl}, '%')</if>