From 729c484fdaccd2c7a726f1385bc7b3ea4a3fc8fe Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 5 Jun 2024 13:14:12 +0800
Subject: [PATCH] md

---
 .../src/main/resources/mapper/EmisTmsScanRecordMapper.xml    | 5 +++--
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml     | 5 +++--
 .../main/resources/mapper/EmisWaybillProblemInfoMapper.xml   | 3 ++-
 .../src/main/resources/mapper/EmisWaybillTransferMapper.xml  | 3 ++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 06ef363a6..59cd7fa3d 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -200,8 +200,9 @@
         <include refid="selectEmisTmsScanRecordVo"/>
         <where>
             <if test="id != null "> and id = #{id}</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="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 bill_code like concat('%', #{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>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index b47aa2dbb..405e3cd32 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -282,9 +282,10 @@
         <where>
             del_flag='0'
             <if test="id != null "> and id = #{id}</if>
-            <if test="orderSn != null  and orderSn != ''"> and FIND_IN_SET(`order_sn`,#{orderSn}) </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 bill_code like concat('%', #{billCode}, '%') )  </if>
+
             <if test="custOrderId != null  and custOrderId != ''"> and cust_order_id=#{custOrderId}</if>
-            <if test="billCode != null  and billCode != ''"> and FIND_IN_SET(`bill_code`,#{billCode}) </if>
             <if test="billCodeSub != null  and billCodeSub != ''"> and bill_code_sub like concat('%', #{billCodeSub}, '%')</if>
             <if test="orderStatus != null  and orderStatus != ''"> and order_status like concat('%', #{orderStatus}, '%')</if>
             <if test="waybillStatus != null  and waybillStatus != ''"> and waybill_status like concat('%', #{waybillStatus}, '%')</if>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
index 996874630..ebad9bd17 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
@@ -46,7 +46,8 @@
         <where>
             del_flag='0'
             <if test="id != null "> and id = #{id}</if>
-            <if test="billCode != null  and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
+            <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
+
             <if test="problemType != null  and problemType != ''"> and problem_type like concat('%', #{problemType}, '%')</if>
             <if test="problemTitle != null  and problemTitle != ''"> and problem_title like concat('%', #{problemTitle}, '%')</if>
             <if test="problemCause != null  and problemCause != ''"> and problem_cause like concat('%', #{problemCause}, '%')</if>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
index f6ef3e010..8c8c67cd9 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
@@ -39,7 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
              del_flag='0'
             <if test="id != null "> and id = #{id}</if>
-            <if test="billCode != null  and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
+            <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
+
             <if test="transferBillCode != null  and transferBillCode != ''"> and transfer_bill_code like concat('%', #{transferBillCode}, '%')</if>
             <if test="transferDate != null "> and transfer_date = #{transferDate}</if>
             <if test="transferExpress != null  and transferExpress != ''"> and transfer_express like concat('%', #{transferExpress}, '%')</if>