|
|
@@ -534,7 +534,7 @@
|
|
|
date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
|
|
|
a.latitude ,a.longitude ,a.clock_in clockIn,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.type,a.main_name mainName,a.reject_name rejectName,
|
|
|
- a.assistant_aid assistantAid ,a.assistant_name assistantName
|
|
|
+ a.assistant_aid assistantAid ,a.assistant_name assistantName,a.public_again publicAgain
|
|
|
from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
|
|
|
<if test="type==2">
|
|
|
left join department d on c.department_id =d.id
|
|
|
@@ -670,7 +670,7 @@
|
|
|
a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,a.longitude ,a.aid ,c.superior_id suprId,a.uid,
|
|
|
a.clock_in clockIn ,a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,
|
|
|
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.main_name mainName,a.assistant_aid assistantAid,a.assistant_name assistantName,a.public_again publicAhain
|
|
|
from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
|
|
|
left join t_order_new d on a.order_no=d.order_no
|
|
|
where 1=1
|