|
|
@@ -1525,15 +1525,16 @@ where super_id is null ) e on e.order_no=a.order_no
|
|
|
select sum(b.amount) actuallyTotalAmount,sum(o.total_amount) signTotalAmount from t_order_new o
|
|
|
left join department d on o.order_dep=d.id left join `user` u on o.buyer_id = u.id
|
|
|
left join ( select sum(transaction_amount) as amount , order_no from t_order_bill_new group by order_no ) b on b.order_no = o.order_no
|
|
|
- where delete_sign != 1 and outsource= #{outsource,jdbcType=INTEGER}
|
|
|
+ where delete_sign != 1 and (approval = 0 or approval = 2) and outsource= #{outsource,jdbcType=INTEGER}
|
|
|
<if test="processStatus == 3">
|
|
|
and o.process_status = #{processStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
<if test="processStatus == 4">
|
|
|
and o.process_status >= #{processStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
- and (approval = 0 or approval = 2)
|
|
|
+ <if test="financeId != null and financeId != """>
|
|
|
and d.finance_id = #{financeId,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
<if test="orderStatus != null and orderStatus != """>
|
|
|
and o.order_status = #{orderStatus,jdbcType=INTEGER}
|
|
|
</if>
|