|
|
@@ -741,7 +741,7 @@
|
|
|
b.settlement_amount as settlementAmount, (b.total_amount-b.settlement_amount) as notAmount from t_order_invoice a
|
|
|
left join t_order_new b on a.order_no=b.order_no left join admin c on b.salesman_id=c.id
|
|
|
left join (select order_no,sum(amount)as sumAmount from t_order_invoice where status =2 group by order_no) d
|
|
|
- on a.order_no=d.order_no where 1=1
|
|
|
+ on a.order_no=d.order_no where b.delete_sign in (0,2)
|
|
|
<if test="status ==null">
|
|
|
and a.status in(1,2)
|
|
|
</if>
|
|
|
@@ -781,7 +781,7 @@
|
|
|
<select id="approvalOrderInvoiceCount" resultType="java.lang.Integer">
|
|
|
select count(*) from t_order_invoice a
|
|
|
left join t_order_new b on a.order_no=b.order_no left join admin c on b.salesman_id=c.id
|
|
|
- where 1=1
|
|
|
+ where b.delete_sign in (0,2)
|
|
|
<if test="status ==null">
|
|
|
and a.status in(1,2)
|
|
|
</if>
|