|
|
@@ -1155,14 +1155,14 @@ where delete_sign != 1 and (approval = 0 or approval = 2) and outsource= #{o.ou
|
|
|
<if test="o.processStatus == 4">
|
|
|
and o.process_status >= #{o.processStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
- <if test="o.financeId != null and o.financeId != """>
|
|
|
+ <if test="o.financeId != null and o.financeId != """>
|
|
|
and d.finance_id = #{o.financeId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="fids != null and o.financeId != """>
|
|
|
and d.finance_id =
|
|
|
<foreach item="item" collection="fids" separator="," open="(" close=")" index="">
|
|
|
- #{item.id}
|
|
|
- </foreach>
|
|
|
+ #{item}
|
|
|
+ </foreach>
|
|
|
</if>
|
|
|
<if test="o.orderStatus != null and o.orderStatus != """>
|
|
|
and o.order_status = #{o.orderStatus,jdbcType=INTEGER}
|
|
|
@@ -1176,7 +1176,6 @@ where delete_sign != 1 and (approval = 0 or approval = 2) and outsource= #{o.ou
|
|
|
<if test="o.liquidationStatus != null">
|
|
|
and o.liquidation_status = #{o.liquidationStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
-
|
|
|
<if test="o.orderNo != null and o.orderNo != """>
|
|
|
and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|