|
|
@@ -319,10 +319,12 @@
|
|
|
|
|
|
<select id="selectExpenseAccountList" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountBo">
|
|
|
select a.id,a.total_amount totalAmount,a.`type`,a.process_status processStatus,a.status,a.examine_name examineName,
|
|
|
- date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,a.aname, b.name appDepName, c.name payDepName
|
|
|
+ e.contract_no contractNo,tm.buyer_name buyerName ,f.name depName,d2.name financeName,
|
|
|
+ date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,a.aname, b.name appDepName, c.name payDepName
|
|
|
from expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
|
|
|
left join admin d on a.aid =d.id left join t_order_new e on a.order_no =e.order_no
|
|
|
- left join t_order_mid tm on a.order_no =tm.order_no
|
|
|
+ left join t_order_mid tm on a.order_no =tm.order_no left join department f on d.department_id =f.id
|
|
|
+ left join admin d2 on f.finance_id =d2.id
|
|
|
where 1=1
|
|
|
<if test="processStatus ==0">
|
|
|
and a.aid= #{aid}
|