This commit is contained in:
linfso 2025-03-31 10:37:37 +08:00
parent 9367dac479
commit baeea90f1d
2 changed files with 11 additions and 3 deletions

View File

@ -280,8 +280,16 @@
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="orderSn != null and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
<if test="billCode != null and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or FIND_IN_SET(`main_bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') ) </if>
<if test="orderSn != null and orderSn != ''">
and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') )
</if>
<if test="billCode != null and billCode != ''">
<!-- and ( FIND_IN_SET(`bill_code`,#{billCode}) or FIND_IN_SET(`main_bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') ) -->
and bill_code in
<foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="scanType != null and scanType != ''"> and scan_type=#{scanType}</if>
<if test="preOrNextStation != null and preOrNextStation != ''"> and pre_or_next_station like concat('%', #{preOrNextStation}, '%')</if>

View File

@ -28,7 +28,7 @@
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="waybillId != null "> and waybill_id = #{waybillId}</if>
<if test="billCode != null and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') ) </if>
<if test="billCode != null and billCode != ''"> and `bill_code` ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') ) </if>
<if test="attachType != null and attachType != ''"> and FIND_IN_SET(attach_type,#{attachType})</if>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="fileUrl != null and fileUrl != ''"> and file_url like concat('%', #{fileUrl}, '%')</if>