|
|
@@ -453,7 +453,8 @@
|
|
|
eae.type eaeType,
|
|
|
</if>
|
|
|
<if test="expenseMain ==0">
|
|
|
- mea.examine_name examineName,mea.check_no checkNo,mea.id mainId, mea.target_type targetType,
|
|
|
+ mea.examine_name examineName,mea.check_no checkNo,mea.id mainId, a.target_type targetType,
|
|
|
+
|
|
|
</if>
|
|
|
<if test="expenseMain ==1">
|
|
|
a.examine_name examineName,a.check_no checkNo,a.target_type targetType,a.order_remarks orderRemarks,
|
|
|
@@ -471,7 +472,7 @@
|
|
|
<if test="expenseMain ==0">
|
|
|
left join expense_relationship er on a.id=er.ea_id
|
|
|
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 t_order_new e on a.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 d2 on b.expense_finance_id =d2.id
|
|
|
</if>
|