From 84eec20982dca1a51e784a52a420f132bd49f8bf Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 21 Jul 2024 10:14:08 +0800
Subject: [PATCH] md

---
 .../resources/mapper/EmisTmsScanRecordMapper.xml    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 38df5ef2d..4982e7594 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -98,7 +98,7 @@
     </resultMap>
 
     <select id="queryScanStatInfoDtlList" parameterType="EmisWaybill" resultMap="ScanStatInfoDtlResult">
-        select main_bill_code as bill_code,
+        select main_bill_code as billCode,
             sum(IF(scan_type='10',1,0)) as gotCount,
             sum(IF(scan_type='20',1,0)) as sendCount,
             sum(IF(scan_type='30',1,0)) as arrivalCount,
@@ -124,7 +124,16 @@
                     <if test="params.endSendDate != null ">
                         and b.send_date <![CDATA[ <= ]]>  #{params.endSendDate}
                     </if>
-                    <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
+                    <if test="sendSiteCode != null  and sendSiteCode != ''"> and b.send_site_code= #{sendSiteCode}</if>
+                    <if test="sendCenterCode != null  and sendCenterCode != ''"> and b.send_center_code= #{sendCenterCode}</if>
+                    <if test="dispatchUnderlingSiteCode != null  and dispatchUnderlingSiteCode != ''">
+                        and b.dispatch_underling_site_code= #{dispatchUnderlingSiteCode}
+                    </if>
+                    <if test="destinationCenterCode != null  and destinationCenterCode != ''">
+                        and b.destination_center_code= #{destinationCenterCode}
+                    </if>
+
+        <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                         and (
                             a.dispatch_underling_site_code in (
                             SELECT t1.site_code FROM (