|
@@ -368,10 +368,10 @@
|
|
|
left join admin d2 on f.finance_id =d2.id
|
|
left join admin d2 on f.finance_id =d2.id
|
|
|
<if test="processStatus ==1">
|
|
<if test="processStatus ==1">
|
|
|
inner join (select eaid ,auditor,min(process_status)`type` from expense_account_examine
|
|
inner join (select eaid ,auditor,min(process_status)`type` from expense_account_examine
|
|
|
- where auditor= #{aid} group by eaid) eae on a.id=eae.eaid
|
|
|
|
|
|
|
+ where auditor= #{auditor} group by eaid) eae on a.id=eae.eaid
|
|
|
</if>
|
|
</if>
|
|
|
where 1=1
|
|
where 1=1
|
|
|
- <if test="superShiro ==1">
|
|
|
|
|
|
|
+ <if test="superShiro ==2">
|
|
|
and a.process_status>0
|
|
and a.process_status>0
|
|
|
</if>
|
|
</if>
|
|
|
<if test=" aid !=null">
|
|
<if test=" aid !=null">
|
|
@@ -423,10 +423,10 @@
|
|
|
left join t_order_mid tm on a.order_no =tm.order_no
|
|
left join t_order_mid tm on a.order_no =tm.order_no
|
|
|
<if test="processStatus ==1">
|
|
<if test="processStatus ==1">
|
|
|
inner join (select eaid ,auditor,min(process_status)`type` from expense_account_examine
|
|
inner join (select eaid ,auditor,min(process_status)`type` from expense_account_examine
|
|
|
- where auditor= #{aid} group by eaid) eae on a.id=eae.eaid
|
|
|
|
|
|
|
+ where auditor= #{auditor} group by eaid) eae on a.id=eae.eaid
|
|
|
</if>
|
|
</if>
|
|
|
where 1=1
|
|
where 1=1
|
|
|
- <if test="superShiro ==1">
|
|
|
|
|
|
|
+ <if test="superShiro ==2">
|
|
|
and a.process_status>0
|
|
and a.process_status>0
|
|
|
</if>
|
|
</if>
|
|
|
<if test=" aid !=null">
|
|
<if test=" aid !=null">
|
|
@@ -474,12 +474,11 @@
|
|
|
left join t_order_mid tm on a.order_no =tm.order_no
|
|
left join t_order_mid tm on a.order_no =tm.order_no
|
|
|
<if test="processStatus ==1">
|
|
<if test="processStatus ==1">
|
|
|
inner join (select eaid ,auditor,min(process_status)`type` from expense_account_examine
|
|
inner join (select eaid ,auditor,min(process_status)`type` from expense_account_examine
|
|
|
- where auditor= #{aid} group by eaid) eae on a.id=eae.eaid
|
|
|
|
|
|
|
+ where auditor= #{auditor} group by eaid) eae on a.id=eae.eaid
|
|
|
</if>
|
|
</if>
|
|
|
where 1=1
|
|
where 1=1
|
|
|
- <if test="superShiro ==1">
|
|
|
|
|
|
|
+ <if test="superShiro ==2">
|
|
|
and a.process_status>0
|
|
and a.process_status>0
|
|
|
-
|
|
|
|
|
</if>
|
|
</if>
|
|
|
<if test=" aid !=null">
|
|
<if test=" aid !=null">
|
|
|
and a.aid= #{aid}
|
|
and a.aid= #{aid}
|