This commit is contained in:
linfso 2025-01-15 13:56:39 +08:00
parent 90d44b9991
commit 67822dfde9

View File

@ -1264,11 +1264,11 @@
and a.send_date <![CDATA[ <= ]]> #{params.endDate}
</if>
<if test="params.blUploadGoodsPic != null and params.blUploadGoodsPic == 1">
<if test="params.blUploadGoodsPic != null and params.blUploadGoodsPic != '' and params.blUploadGoodsPic == 1">
and a.goods_pics is not null
</if>
<if test="params.blUploadGoodsPic != null and params.blUploadGoodsPic == 0">
<if test="params.blUploadGoodsPic != null and params.blUploadGoodsPic != '' and params.blUploadGoodsPic == 0">
and a.goods_pics is null
</if>
@ -1801,15 +1801,16 @@
and a.bl_sign=#{blSign}
</if>
<if test="params.blUploadGoodsPic != null and params.blUploadGoodsPic == 1">
<if test="params.blUploadGoodsPic != null and params.blUploadGoodsPic != '' and params.blUploadGoodsPic == 1">
and a.goods_pics is not null
</if>
<if test="params.blUploadGoodsPic != null and params.blUploadGoodsPic == 0">
<if test="params.blUploadGoodsPic != null and params.blUploadGoodsPic != '' and params.blUploadGoodsPic == 0">
and a.goods_pics is null
</if>
<if test="params.beginDate != null and params.beginDate != ''">
and a.send_date <![CDATA[ >= ]]> #{params.beginDate}
</if>
@ -1910,8 +1911,9 @@
from emis_waybill a
<where>
a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
and ( a.problem_type is null or (a.problem_type is not null and (a.problem_type != 173 and a.problem_type != 170 and a.problem_type != 151) ) )
and a.bill_code not in (
select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and ewpi.`problem_type` in('171','170','151') )
)
<!--
<if test="params.queryDateType != null and params.queryDateType == 1 ">
and to_days(a.send_date) = to_days(now())
@ -1955,7 +1957,6 @@
<select id="getMyBizStatListByCountry" parameterType="EmisWaybill" resultType="map">
<!--
'柬埔寨','越南','缅甸','孟加拉','老挝','中国'
0086 中国
@ -1993,8 +1994,9 @@
a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
and b.del_flag='0' and c.del_flag='0'
and a.receive_country=b.code and a.trans_line_type=c.line_code
and ( a.problem_type is null or (a.problem_type is not null and (a.problem_type != 173 and a.problem_type != 170 and a.problem_type != 151) ) )
and a.bill_code not in (
select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and ewpi.`problem_type` in('171','170','151') )
)
<if test="params.beginDate != null and params.beginDate != ''">
and a.send_date <![CDATA[ >= ]]> #{params.beginDate}
</if>