|
|
@@ -370,7 +370,7 @@
|
|
|
ea.total_amount expenseAmount ,a.clock_in clockIn,c2.name reviewerName,a.tech_start_process techStartProcess
|
|
|
from public_release a left join admin c on a.aid =c.id
|
|
|
left join admin c2 on c.reviewer=c2.id
|
|
|
- left join (select * from expense_account where status in (0,1,2,3)) ea on a.id =ea.prid
|
|
|
+ left join expense_account ea ON a.id = ea.prid AND ea.status IN (0, 1, 2, 3)
|
|
|
<if test="type==2">
|
|
|
left join department d on c.department_id =d.id
|
|
|
</if>
|
|
|
@@ -380,7 +380,7 @@
|
|
|
</if>
|
|
|
<if test="type==5">
|
|
|
left join t_order_new ton on a.order_no =ton.order_no
|
|
|
- left join t_order_mid tom on a.order_no=ton.order_no
|
|
|
+ left join t_order_mid tom on a.order_no=tom.order_no
|
|
|
</if>
|
|
|
where 1=1
|
|
|
<include refid="listPublicReleaseSql"/>
|