|
|
@@ -868,10 +868,12 @@
|
|
|
a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.aid ,c.superior_id suprId,a.tech_start_process techStartProcess,a.alone,
|
|
|
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
|
|
|
+ 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,
|
|
|
+ pad.type as assistType,pad.content_type assistContentType,pad.content assistContent
|
|
|
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
|
|
|
+ left join public_assist_details pad on a.id=pad.prid
|
|
|
where 1=1
|
|
|
<if test="id !=null">
|
|
|
and a.id= #{id}
|