From 9702583f0462ebe533dc60a216ebfc0cbfdcfec4 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 8 Jul 2025 09:45:46 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=E6=89=B9=E9=87=8F=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E8=BF=87=E6=BB=A4=E6=9C=AA=E6=8E=A5=E5=8D=95?= =?UTF-8?q?/=E5=B7=B2=E5=8F=96=E6=B6=88=E7=9A=84=E8=BF=90=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E6=89=AB=E6=8F=8F=E8=BF=87=E6=BB=A4=E8=BF=9B=E5=8F=A3?= =?UTF-8?q?=E7=9A=84=E8=99=9A=E6=8B=9F=E5=8D=95=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 5535b4d84..a706bb5fa 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -3822,8 +3822,12 @@ and a.send_date ]]> '2025-01-01 00:00:00' and a.send_date DATE_SUB(CURDATE(), INTERVAL 7 DAY) - and (a.virtual_remark is null or virtual_remark = '' or virtual_remark = ' ') - and (a.problem_type is null or a.problem_type != 151) + and ( + (a.receive_country = '0086' and a.problem_type not in (173,170,151)) + or + (a.receive_country != '0086' and (a.virtual_remark is null or a.virtual_remark = '' or a.virtual_remark = ' ')and (a.problem_type is null or a.problem_type != 151)) + ) + and a.order_status not in ('0','2') order by a.create_time desc limit #{offset}, #{pageSize}