|
|
@@ -1321,12 +1321,12 @@
|
|
|
select IFNULL( sum(o.settlement_amount),0) actuallyTotalAmount,IFNULL(sum(o.total_amount),0) 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 t_order_mid a on o.order_no=a.order_no
|
|
|
- <if test="type !=null">
|
|
|
+ <if test="o.type !=null">
|
|
|
inner join
|
|
|
(select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
|
|
|
from t_order_approval
|
|
|
where `type` in
|
|
|
- <foreach collection="type" item="item" separator="," open="(" close=")">
|
|
|
+ <foreach collection="o.type" item="item" separator="," open="(" close=")">
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
group by order_no) toa on o.order_no=toa.order_no
|