From 846cc6b438cdb97c85cca51ee3d7370c4bca619c Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 10 Jul 2025 16:49:21 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E6=89=AB=E6=8F=8F=E6=BC=8F=E7=BB=84?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E9=97=AE=E9=A2=98=E4=BB=B6=E5=8F=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BB=B6=E8=A1=A8=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/EmisWaybillMapper.xml  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 008006669..14cbdf288 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -3816,17 +3816,23 @@
         select a.id, a.bill_code,a.trans_line_type,
         a.product_type,a.start_site_code,a.send_site_code,a.problem_type,a.virtual_remark
         from emis_waybill a
-        left join emis_waybill_batch_status b on a.bill_code = b.bill_code
-        and (b.site_batch_status is null or b.site_batch_status != '1')
         where a.del_flag = '0'
         <if test="lineCode != null and lineCode != ''">
             and a.trans_line_type = #{lineCode}
         </if>
         and DATE_FORMAT(a.send_date, '%Y-%m-%d') <![CDATA[ >= ]]> '2025-01-01'
-        and DATE_FORMAT(a.send_date, '%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 7 DAY), '%Y-%m-%d')
-        and (a.problem_type is null or a.problem_type not in (151,170))
-        and ((a.virtual_remark is null or a.virtual_remark = '' or a.virtual_remark = ' ')or a.receive_country != '0095')
+        and DATE_FORMAT(a.send_date, '%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 7 DAY),
+        '%Y-%m-%d')
+        and ((a.virtual_remark is null or a.virtual_remark = '' or a.virtual_remark = ' ')or a.receive_country !=
+        '0095')
         and a.order_status not in ('0','2')
+        and not exists (
+        select 1 from emis_waybill_batch_status b where a.bill_code = b.bill_code and b.site_batch_status = '1' and b.del_flag = '0'
+        )
+        and not exists (
+        select 1 from emis_waybill_problem_info c where a.bill_code = c.bill_code and c.problem_type in (151,170)
+        and c.del_flag = '0'
+        )
         order by a.create_time desc
         limit #{offset}, #{pageSize}
     </select>