|
|
@@ -458,7 +458,7 @@
|
|
|
<if test="expenseMain ==1">
|
|
|
a.examine_name examineName,a.check_no checkNo,a.target_type targetType,
|
|
|
</if>
|
|
|
- f.name depName,d2.name financeName, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,a.aname,
|
|
|
+ f.name depName,bad.name financeName, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,a.aname,
|
|
|
b.name applyDepName, c.name payDepName
|
|
|
from expense_account a
|
|
|
<if test="type !=null">
|
|
|
@@ -474,10 +474,12 @@
|
|
|
left join expense_account mea on er.id=mea.id
|
|
|
left join t_order_new e on mea.order_no =e.order_no
|
|
|
left join department b on mea.apply_dep =b.id left join department c on mea.pay_dep =c.id
|
|
|
+ left join admin bad on b.expense_finance_id=bad.id
|
|
|
</if>
|
|
|
<if test="expenseMain ==1">
|
|
|
left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
|
|
|
left join t_order_new e on a.order_no =e.order_no
|
|
|
+ left join admin bad on b.expense_finance_id=bad.id
|
|
|
</if>
|
|
|
left join t_order_mid tm on e.order_no =tm.order_no
|
|
|
<if test="processStatus ==1">
|