From f680402e0f2b0290d2773121d5fcf24533f8cf17 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 25 Jul 2024 19:00:27 +0800
Subject: [PATCH] md

---
 emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml   | 7 +++++++
 .../src/main/resources/mapper/EmisTmsScanRecordMapper.xml  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
index 9a07961f6..45e437f52 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
@@ -78,6 +78,13 @@
             <if test="createSite != null  and createSite != ''"> and create_site = #{createSite}</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site = #{updateSite}</if>
 
+            <if test="params.beginSendDate != null and params.beginSendDate != ''">
+                and create_time <![CDATA[ >= ]]>  #{params.beginCreateTime}
+            </if>
+            <if test="params.endSendDate != null and params.endSendDate != ''">
+                and create_time <![CDATA[ <= ]]>  #{params.endCreateTime}
+            </if>
+
             <if test="params.beginCreateTime != null and params.beginCreateTime != ''">
                 and create_time <![CDATA[ >= ]]>  #{params.beginCreateTime}
             </if>
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 54b4e9d45..03b1364c2 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -141,7 +141,7 @@
 
                     <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                         and (
-                            a.dispatch_underling_site_code in (
+                            b.dispatch_underling_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