|
|
@@ -453,13 +453,14 @@
|
|
|
eae.type eaeType,
|
|
|
</if>
|
|
|
<if test="expenseMain ==0">
|
|
|
- mea.examine_name examineName,mea.check_no checkNo,mea.id mainId, a.target_type targetType,
|
|
|
+ mea.examine_name examineName,mea.check_no checkNo,mea.id mainId, a.target_type targetType,e.contract_no contractNo,tm.buyer_name buyerName,
|
|
|
</if>
|
|
|
<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,
|
|
|
- b.name applyDepName, c.name payDepName,e.contract_no contractNo,tm.buyer_name buyerName
|
|
|
+ b.name applyDepName, c.name payDepName
|
|
|
+
|
|
|
from expense_account a
|
|
|
<if test="type !=null">
|
|
|
right join (select a.id
|
|
|
@@ -478,10 +479,12 @@
|
|
|
</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
|
|
|
+ <if test="contractNo !=null or username !=null">
|
|
|
left join expense_relationship er on a.id=er.id
|
|
|
left join expense_account sea on er.ea_id=sea.id
|
|
|
left join t_order_new e on sea.order_no =e.order_no
|
|
|
left join t_order_mid tm on e.order_no =tm.order_no
|
|
|
+ </if>
|
|
|
left join admin d2 on b.expense_finance_id =d2.id
|
|
|
</if>
|
|
|
<if test="processStatus ==1">
|