diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index e34b1075e..03a2ba25b 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -3933,9 +3933,9 @@ and a.trans_line_type = #{lineCode} - and DATE_FORMAT(a.send_date, '%Y-%m-%d') = ]]> '2025-01-01' - and DATE_FORMAT(a.send_date, '%Y-%m-%d') DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 7 DAY), - '%Y-%m-%d') +-- and DATE_FORMAT(a.send_date, '%Y-%m-%d') = ]]> '2025-01-01' +-- and DATE_FORMAT(a.send_date, '%Y-%m-%d') 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')