|
|
@@ -1079,14 +1079,14 @@
|
|
|
</select>
|
|
|
<!-- 财务专员查看需要待收款的数据 -->
|
|
|
<select id="financeList" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
|
|
|
- select o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,a1.name financeName,
|
|
|
+ select o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,a.finance_name financeName,
|
|
|
o.process_status as processStatus, ifnull(b.amount, 0) as actuallyTotalAmount, o.contract_no as contractNo, o.approval,
|
|
|
- a.name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus ,too.amount outsourceAmount,
|
|
|
+ a.salesman_name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus ,too.amount outsourceAmount,
|
|
|
o.first_amount as signFirstPayment, o.total_amount as signTotalAmount, date_format(o.create_time, '%Y-%m-%d %H:%i:%s') as createTime,
|
|
|
e.name as outsourceName, 0 as companyId, d.name as departmentName, f.transaction_amount finalReceivables ,
|
|
|
date_format(f.create_time, '%Y-%m-%d %H:%i:%s')finalReceivablesTime, g.invoiceAmount 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 admin a on o.salesman_id = a.id
|
|
|
-left join admin a1 on d.finance_id = a1.id left join ( select sum(transaction_amount) as amount , order_no from t_order_bill_new group by order_no ) b
|
|
|
+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 a.order_no=a.order_no
|
|
|
+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 left join ( select order_no, max(name) as name from outsource_organization group by order_no) e on o.order_no = e.order_no
|
|
|
left join (select x1.order_no,max(create_time) create_time,max(transaction_amount)transaction_amount from
|
|
|
(select x.order_no,x.create_time,x.transaction_amount from t_order_bill_new x right join (select order_no, max(create_time) maxTime from t_order_bill_new group by order_no)y
|
|
|
@@ -1143,7 +1143,7 @@ where delete_sign != 1 and (approval = 0 or approval = 2) and outsource= #{o.ou
|
|
|
</if>
|
|
|
</select>
|
|
|
<select id="financeCount" parameterType="Map" resultType="java.lang.Integer">
|
|
|
- select count(*) from t_order_new o left join `user` u on o.buyer_id = u.id left join admin a on o.salesman_id = a.id
|
|
|
+ select count(*) from t_order_new o left join `user` u on o.buyer_id = u.id left join t_order_mid a on a.order_no=a.order_no
|
|
|
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
|
|
|
left join department d on o.order_dep = d.id left join (select x1.order_no,max(create_time) create_time,max(transaction_amount)transaction_amount from
|
|
|
(select x.order_no,x.create_time,x.transaction_amount from t_order_bill_new x right join (select order_no, max(create_time) maxTime from t_order_bill_new group by order_no)y
|