|
@@ -128,7 +128,7 @@
|
|
|
and ( l.name like concat('%'
|
|
and ( l.name like concat('%'
|
|
|
, #{settlementReq.keywords,jdbcType=VARCHAR}
|
|
, #{settlementReq.keywords,jdbcType=VARCHAR}
|
|
|
, '%')
|
|
, '%')
|
|
|
- or l.l_ledger_no like concat('%'
|
|
|
|
|
|
|
+ or l.l_ledger_no like concat('%'
|
|
|
, #{settlementReq.keywords,jdbcType=VARCHAR}
|
|
, #{settlementReq.keywords,jdbcType=VARCHAR}
|
|
|
, '%')
|
|
, '%')
|
|
|
or lu2.firm_name like concat('%'
|
|
or lu2.firm_name like concat('%'
|
|
@@ -376,7 +376,7 @@
|
|
|
lu.unit_type = #{unitType,jdbcType=INTEGER}
|
|
lu.unit_type = #{unitType,jdbcType=INTEGER}
|
|
|
<where>
|
|
<where>
|
|
|
s.del_flag = 0
|
|
s.del_flag = 0
|
|
|
- and s.id = #{id,jdbcType=BIGINT}
|
|
|
|
|
|
|
+ and s.id = #{id,jdbcType=BIGINT}
|
|
|
</where>
|
|
</where>
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
@@ -415,13 +415,17 @@
|
|
|
and s.del_flag = 0
|
|
and s.del_flag = 0
|
|
|
and lu.del_flag = 0
|
|
and lu.del_flag = 0
|
|
|
and lu2.del_flag = 0
|
|
and lu2.del_flag = 0
|
|
|
- <include refid="settlementLogisticsSelectWhere"/>
|
|
|
|
|
- <if test="ids != null and ids.size() > 0">
|
|
|
|
|
- and s.id in
|
|
|
|
|
- <foreach collection="ids" item="id" close=")" open="(" separator=",">
|
|
|
|
|
- #{id,jdbcType=BIGINT}
|
|
|
|
|
- </foreach>
|
|
|
|
|
- </if>
|
|
|
|
|
|
|
+ <choose>
|
|
|
|
|
+ <when test="ids != null and ids.size() > 0">
|
|
|
|
|
+ and s.id in
|
|
|
|
|
+ <foreach collection="ids" item="id" close=")" open="(" separator=",">
|
|
|
|
|
+ #{id,jdbcType=BIGINT}
|
|
|
|
|
+ </foreach>
|
|
|
|
|
+ </when>
|
|
|
|
|
+ <otherwise>
|
|
|
|
|
+ <include refid="settlementLogisticsSelectWhere"/>
|
|
|
|
|
+ </otherwise>
|
|
|
|
|
+ </choose>
|
|
|
</where>
|
|
</where>
|
|
|
order by s.update_time desc
|
|
order by s.update_time desc
|
|
|
</select>
|
|
</select>
|