|
|
@@ -477,8 +477,10 @@
|
|
|
left join admin d2 on b.expense_finance_id =d2.id
|
|
|
</if>
|
|
|
<if test="expenseMain ==1">
|
|
|
+ left join expense_relationship er on a.id=er.id
|
|
|
+ left join expense_account sea on er.ea_id=sea.id
|
|
|
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 t_order_new e on sea.order_no =e.order_no
|
|
|
left join admin d2 on b.expense_finance_id =d2.id
|
|
|
</if>
|
|
|
left join t_order_mid tm on e.order_no =tm.order_no
|
|
|
@@ -588,7 +590,11 @@
|
|
|
left join department b on mea.apply_dep =b.id left join department c on mea.pay_dep =c.id
|
|
|
</if>
|
|
|
<if test="expenseMain ==1">
|
|
|
+ left join expense_relationship er on a.id=er.id
|
|
|
+ left join expense_account sea on er.ea_id=sea.id
|
|
|
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 sea.order_no =e.order_no
|
|
|
+ left join admin d2 on b.expense_finance_id =d2.id
|
|
|
</if>
|
|
|
<if test="processStatus ==1">
|
|
|
inner join (select eaid ,auditor,min(process_status)`type` from expense_account_examine
|
|
|
@@ -614,8 +620,11 @@
|
|
|
left join department b on mea.apply_dep =b.id left join department c on mea.pay_dep =c.id
|
|
|
</if>
|
|
|
<if test="expenseMain ==1">
|
|
|
- left join t_order_new e on a.order_no =e.order_no
|
|
|
+ left join expense_relationship er on a.id=er.id
|
|
|
+ left join expense_account sea on er.ea_id=sea.id
|
|
|
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 sea.order_no =e.order_no
|
|
|
+ left join admin d2 on b.expense_finance_id =d2.id
|
|
|
</if>
|
|
|
<if test="processStatus ==1">
|
|
|
inner join (select eaid ,auditor,min(process_status)`type` from expense_account_examine
|