aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service

Browse Source
This commit is contained in:
linfso 2025-07-08 09:51:48 +08:00
commit 058597b8d0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -3822,8 +3822,12 @@
</if>
and a.send_date <![CDATA[ > ]]> '2025-01-01 00:00:00'
and a.send_date <![CDATA[ <= ]]> 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}
</select>