From 2c6efb973cfd06277d5ec318669b8562b8d0e67b Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 5 Nov 2025 11:04:21 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6=E7=AE=A1=E7=90=86=20-=20=E7=AD=BE=E6=94=B6?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AF=B9=E6=AF=94-=E8=BF=90=E8=BE=93?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=B8=BA=E7=A9=BA=E8=BF=90=E4=B8=94=E6=B8=85?=
 =?UTF-8?q?=E5=85=B3=E6=96=B9=E5=BC=8F=E4=B8=BA=E8=87=AA=E6=B8=85=E8=87=AA?=
 =?UTF-8?q?=E6=8F=90=E7=9A=84=E8=BF=90=E5=8D=95=E9=BB=98=E8=AE=A4=E5=B7=B2?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/EmisTmsScanRecordMapper.xml  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index d89d0b530..5aaeed49d 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -165,11 +165,13 @@
     select bill_code from emis_waybill_problem_info ewpi where  ewpi.del_flag='0' and  ewpi.`problem_type` in(151,173,170)
     )-->
     <select id="queryScanStatList" parameterType="EmisTmsScanRecord" resultMap="ScanStatDataInfoResult">
-        select tbA.scan_site_code ,count(tbA.bill_code) as scan_count,sum(if(tbA.bl_sign=1,1,0)) as sign_count,round(round(ifnull(sum(if(tbA.bl_sign=1,1,0)),0)/count(tbA.bill_code),3)*100,1) as sign_rate
+        select tbA.scan_site_code ,count(tbA.bill_code) as scan_count,sum(if(tbA.bl_sign=1 or (tbA.customs_clear=2 and tbA.trans_type=2),1,0)) as sign_count,round(round(ifnull(sum(if(tbA.bl_sign=1 or (tbA.customs_clear=2 and tbA.trans_type=2),1,0)),0)/count(tbA.bill_code),3)*100,1) as sign_rate
         from (
-            select DISTINCT a.scan_site_code,b.bill_code , b.bl_sign
-            from emis_tms_scan_record a,emis_waybill b
-            where  a.del_flag='0' and b.del_flag='0' and a.bill_code=b.bill_code
+            select DISTINCT a.scan_site_code,b.bill_code , b.bl_sign, b.customs_clear, k.trans_type
+            from emis_tms_scan_record a
+            inner join emis_waybill b on a.bill_code=b.bill_code
+            left join emis_trans_line k on b.trans_line_type=k.line_code and k.del_flag='0'
+            where  a.del_flag='0' and b.del_flag='0'
             and  not EXISTS (
                 select 1 from emis_waybill_problem_info ewpi where ewpi.bill_code=b.bill_code and  ewpi.del_flag='0' and  ewpi.`problem_type` in(151,173,170)
             )