|
|
@@ -477,17 +477,14 @@
|
|
|
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.assistant_aid assistantAid ,a.assistant_name assistantName,a.public_again publicAgain,a.user_names userNames
|
|
|
- pe.aname,pe.status peStatus
|
|
|
from public_release a left join admin c on a.aid =c.id
|
|
|
- <if test="type==0 or type==4">
|
|
|
- left join (select * from public_examine where aid= #{aid} )pe on a.id=pe.prid
|
|
|
- </if>
|
|
|
- <if test="type==4">
|
|
|
- left join public_release_details b on a.id=b.prid left join user e on b.uid=e.id
|
|
|
- </if>
|
|
|
+
|
|
|
<if test="type==2">
|
|
|
left join department d on c.department_id =d.id
|
|
|
</if>
|
|
|
+ <if test="type==4">
|
|
|
+ left join public_release_details b on a.id=b.prid left join user e on b.uid=e.id
|
|
|
+ </if>
|
|
|
where 1=1
|
|
|
<if test="type==0">
|
|
|
and a.public_type in (0,1,2)
|
|
|
@@ -546,13 +543,13 @@
|
|
|
<if test="status !=null">
|
|
|
and a.status = #{status}
|
|
|
</if>
|
|
|
- <if test="type==2">
|
|
|
+ <if test="type==2 or type==4">
|
|
|
ORDER BY a.create_time desc
|
|
|
</if>
|
|
|
- <if test="type!=2">
|
|
|
+ <if test="type==0 and type==1 and type==3">
|
|
|
ORDER BY (case when a.status=1 then 1 when a.status=2 then 2 when a.status=3 then 5
|
|
|
when a.status=0 then 3 when a.status=4 then 4
|
|
|
- else 0 end),a.status ,a.create_time desc
|
|
|
+ else 0 end),a.create_time desc
|
|
|
</if>
|
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|