|
|
@@ -893,15 +893,14 @@
|
|
|
left join department d on o.order_dep=d.id left join (select order_no,max(name)as name from outsource_organization group by order_no) e
|
|
|
on o.order_no=e.order_no where delete_sign = 0 and order_status = 2
|
|
|
and approval in (0,2) and outsource=#{o.outsource,jdbcType=INTEGER}
|
|
|
+ and process_status >= 2
|
|
|
<if test="o.processStatus == 2">
|
|
|
- and process_status = #{o.processStatus,jdbcType=INTEGER}
|
|
|
+ and o.finance_id is not null
|
|
|
</if>
|
|
|
<if test="o.processStatus == 3">
|
|
|
- and process_status >= #{o.processStatus,jdbcType=INTEGER}
|
|
|
- </if>
|
|
|
- <if test="o.processStatus == null or o.processStatus ==''">
|
|
|
- and process_status >= 2
|
|
|
+ and o.finance_id is not null
|
|
|
</if>
|
|
|
+
|
|
|
<if test="o.orderNo != null and o.orderNo != """>
|
|
|
and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|