|
@@ -375,16 +375,17 @@
|
|
|
date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus,a.district_name districtName,
|
|
date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus,a.district_name districtName,
|
|
|
a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_name mainName,a.reject_name rejectName,
|
|
a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_name mainName,a.reject_name rejectName,
|
|
|
a.assistant_aid assistantAid ,a.assistant_name assistantName,a.public_again publicAgain,a.user_names userNames,
|
|
a.assistant_aid assistantAid ,a.assistant_name assistantName,a.public_again publicAgain,a.user_names userNames,
|
|
|
- ea.total_amount expenseAmount ,a.clock_in clockIn,c2.name reviewerName,a.tech_start_process techStartProcess
|
|
|
|
|
|
|
+ ea.total_amount expenseAmount ,a.clock_in clockIn,c2.name reviewerName,a.tech_start_process techStartProcess,
|
|
|
|
|
+ ad.name userAdminName
|
|
|
from public_release a left join admin c on a.aid =c.id
|
|
from public_release a left join admin c on a.aid =c.id
|
|
|
left join admin c2 on c.reviewer=c2.id
|
|
left join admin c2 on c.reviewer=c2.id
|
|
|
left join expense_account ea ON a.id = ea.prid AND ea.status IN (0, 1, 2, 3)
|
|
left join expense_account ea ON a.id = ea.prid AND ea.status IN (0, 1, 2, 3)
|
|
|
<if test="type==2">
|
|
<if test="type==2">
|
|
|
left join department d on c.department_id =d.id
|
|
left join department d on c.department_id =d.id
|
|
|
</if>
|
|
</if>
|
|
|
- <if test="type==4 or userName !=null">
|
|
|
|
|
|
|
+ <if test="type==4 or type==5 or userName !=null">
|
|
|
left join public_release_details b on a.id=b.prid
|
|
left join public_release_details b on a.id=b.prid
|
|
|
- left join user e on b.uid=e.id
|
|
|
|
|
|
|
+ left join user e on b.uid=e.id left join admin ad on e.aid=ad.id
|
|
|
</if>
|
|
</if>
|
|
|
<if test="type==5">
|
|
<if test="type==5">
|
|
|
left join t_order_new ton on a.order_no =ton.order_no
|
|
left join t_order_new ton on a.order_no =ton.order_no
|