Commit 34228114 authored by 朱晨阳's avatar 朱晨阳

Merge remote-tracking branch 'origin/developer' into developer

parents 069e69af 56a84b52
...@@ -22,7 +22,7 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan ...@@ -22,7 +22,7 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan
and hygf_preparation_money.amos_unit_name like concat ('%',#{dto.amosUnitName},'%') and hygf_preparation_money.amos_unit_name like concat ('%',#{dto.amosUnitName},'%')
</if> </if>
<if test="dto.oddNumbers != null and dto.oddNumbers != ''"> <if test="dto.oddNumbers != null and dto.oddNumbers != ''">
and hygf_preparation_money.odd_numbers = #{dto.oddNumbers} and hygf_preparation_money.odd_numbers like concat ('%',#{dto.oddNumbers},'%')
</if> </if>
<if test="dto.deliveryState != null and dto.deliveryState != ''"> <if test="dto.deliveryState != null and dto.deliveryState != ''">
and hygf_preparation_money.delivery_state = #{dto.deliveryState} and hygf_preparation_money.delivery_state = #{dto.deliveryState}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment