From 24587dc2176f01962f3e87736b9f57b2ab8a917b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 20 Jun 2024 01:18:17 +0800
Subject: [PATCH] md

---
 .../mapper/EmisTmsScanRecordMapper.xml        | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 4f76c2c67..319794d65 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -132,16 +132,17 @@
 
 
     <select id="queryScanStatRecordList" parameterType="EmisTmsScanRecord" resultMap="EmisTmsScanRecordResult">
-        select id, bill_code, main_bill_code, order_sn, scan_type,
+        select id, bill_code,
+            main_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,
+            pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, max(scan_date) as 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,
              public_trace_info, inner_trace_info, status, del_flag, create_by, create_time,
-              update_by, update_time, remark, update_site, create_site from emis_tms_scan_record
+              update_by, update_time, remark, update_site, create_site
         from emis_tms_scan_record a
         where  a.del_flag='0'
 
@@ -160,13 +161,13 @@
 
         <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
             and (
-                scan_site_code in (
-                SELECT t1.site_code FROM (
-                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                #{params.privSiteCode} ) pd
-                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                UNION
-                SELECT #{params.privSiteCode} FROM dual
+             a.scan_site_code in (
+                    SELECT t1.site_code FROM (
+                    SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                    #{params.privSiteCode} ) pd
+                    WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                    UNION
+                    SELECT #{params.privSiteCode} FROM dual
                 )
             )
         </if>