From 9129bc8513afa4eccba97aff7818018b16bd64a7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 10 May 2024 17:13:02 +0800
Subject: [PATCH] md

---
 .../src/main/resources/mapper/EmisTmsScanRecordMapper.xml  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 76b4a4a24..0d7628b15 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -61,9 +61,10 @@
     <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 params.queryType=1 " > and bill_code like concat(#{billCode}, '%')</if>
-            <if test="orderSn != null  and orderSn != ''  and params.queryType=2"> and order_sn like concat(#{orderSn}, '%')</if>
+            <if test="billCode != null  and billCode != '' " > and bill_code like concat(#{billCode}, '%')</if>
+            <if test="orderSn != null  and orderSn != ''  "> and order_sn like concat(#{orderSn}, '%')</if>
             <if test="scanType != null  and scanType != ''"> and scan_type like concat('%', #{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 like concat('%', #{preOrNextStationCode}, '%')</if>
@@ -122,6 +123,8 @@
         order by create_time desc
     </select>
 
+<!--     and params.queryType = 2-->
+
     <select id="selectEmisTmsScanRecordById" parameterType="Long" resultMap="EmisTmsScanRecordResult">
         select id, bill_code, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
         from emis_tms_scan_record a