|
|
@@ -402,7 +402,12 @@
|
|
|
<if test="processStatus ==1">
|
|
|
eae.type eaeType,
|
|
|
</if>
|
|
|
+ <if test="expenseMain ==0">
|
|
|
mea.status ,mea.examine_name examineName,mea.check_no checkNo,
|
|
|
+ </if>
|
|
|
+ <if test="expenseMain ==1">
|
|
|
+ a.status ,a.examine_name examineName,a.check_no checkNo,
|
|
|
+ </if>
|
|
|
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
|
|
|
@@ -464,7 +469,7 @@
|
|
|
and a.pay_dep = #{payDep}
|
|
|
</if>
|
|
|
<if test="expenseMain != null">
|
|
|
- #{expenseMain}
|
|
|
+ and a.expense_main= #{expenseMain}
|
|
|
</if>
|
|
|
order by a.status,a.create_time desc
|
|
|
<if test="page_sql !=null">
|