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}