|
|
@@ -701,6 +701,7 @@
|
|
|
from public_release a
|
|
|
left join expense_account ea ON a.id = ea.prid AND ea.status IN (0, 1, 2, 3)
|
|
|
<if test="type==2">
|
|
|
+ left join admin c on a.aid=c.id
|
|
|
left join department d on c.department_id =d.id
|
|
|
</if>
|
|
|
<if test="type==4 or type==5 or userName !=null">
|
|
|
@@ -860,7 +861,7 @@
|
|
|
a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,a.address_name addressName,
|
|
|
date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_Status updateStatus,a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,
|
|
|
a.main_name mainName,a.assistant_aid assistantAid,a.assistant_name assistantName,a.public_again publicAhain,x.uids,a.public_type publicType,c2.name reviewerName
|
|
|
- from public_release a left join admin c2 on c.reviewer =c2.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 (select prid ,GROUP_CONCAT(uid)uids from public_release_details where prid= #{id} group by prid)x on a.id=x.prid
|
|
|
left join t_order_new d on a.order_no=d.order_no
|
|
|
where 1=1
|