Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
This commit is contained in:
commit
058597b8d0
@ -3822,8 +3822,12 @@
|
|||||||
</if>
|
</if>
|
||||||
and a.send_date <![CDATA[ > ]]> '2025-01-01 00:00:00'
|
and a.send_date <![CDATA[ > ]]> '2025-01-01 00:00:00'
|
||||||
and a.send_date <![CDATA[ <= ]]> DATE_SUB(CURDATE(), INTERVAL 7 DAY)
|
and a.send_date <![CDATA[ <= ]]> DATE_SUB(CURDATE(), INTERVAL 7 DAY)
|
||||||
and (a.virtual_remark is null or virtual_remark = '' or virtual_remark = ' ')
|
and (
|
||||||
and (a.problem_type is null or a.problem_type != 151)
|
(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
|
order by a.create_time desc
|
||||||
limit #{offset}, #{pageSize}
|
limit #{offset}, #{pageSize}
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user