|
|
@@ -419,11 +419,11 @@
|
|
|
<select id="orderOutsourceList" resultType="com.goafanti.order.bo.OrderOutsourceBo">
|
|
|
select a.order_no orderNo,b.contract_no contractNo,date_format(b.create_time,'%Y-%m-%d %H:%i:%S') createTime,
|
|
|
date_format(b.sign_time,'%Y-%m-%d') signTime,c.nickname userName, e.name depName,b.total_amount totalAmount,
|
|
|
- b.liquidation_status liquidationStatus,a.refund_status refundStatus,d.name adminName,f.name financeName
|
|
|
+ b.liquidation_status liquidationStatus,a.refund_status refundStatus,d.name adminName,g.name financeName
|
|
|
from t_order_outsource a
|
|
|
left join t_order_new b on a.order_no=b.order_no left join `user` c on b.buyer_id=c.id
|
|
|
left join admin d on b.salesman_id=d.id left join department e on d.department_id=e.id
|
|
|
- left join admin f on b.finance_id=f.id
|
|
|
+ left join department f on b.order_dep=f.id left join admin g on f.finance_id=g.id
|
|
|
where b.approval in (0,2)
|
|
|
<if test="refundStatus != null">
|
|
|
and a.refund_status= #{refundStatus}
|