|
|
@@ -716,6 +716,16 @@
|
|
|
left join admin_public_reviewer apr on a.aid=apr.aid
|
|
|
left join public_release_log prl on a.id=prl.prid and prl.aid=#{aid}
|
|
|
</if>
|
|
|
+ <if test="type==6">
|
|
|
+ JOIN (
|
|
|
+ SELECT pr.main_id
|
|
|
+ FROM public_release pr
|
|
|
+ JOIN admin_public_reviewer apr ON pr.aid = apr.aid
|
|
|
+ WHERE pr.`type` IN (3, 6)
|
|
|
+ AND apr.type = 1
|
|
|
+ AND apr.reviewer_id = #{aid}
|
|
|
+ ) sub ON a.id = sub.main_id
|
|
|
+ </if>
|
|
|
<if test="type==7">
|
|
|
left join t_order_public_release_count opc on a.order_no=opc.order_no
|
|
|
</if>
|
|
|
@@ -815,9 +825,7 @@
|
|
|
<if test="type==6">
|
|
|
and a.type in (0,5)
|
|
|
and a.assist=1
|
|
|
- and a.id in (select pr.main_id from public_release pr left join admin_public_reviewer apr
|
|
|
- on pr.aid = apr.aid where pr.`type` in (3,6)
|
|
|
- and apr.type = 1 and apr.reviewer_id = #{aid})
|
|
|
+ and a.process_status in(0,3)
|
|
|
</if>
|
|
|
<if test="type==7">
|
|
|
and opc.max_process in (1,2,3,4,5)
|
|
|
@@ -867,6 +875,16 @@
|
|
|
left join admin_public_reviewer apr on a.aid=apr.aid
|
|
|
left join public_release_log prl on a.id=prl.prid and prl.aid=#{aid}
|
|
|
</if>
|
|
|
+ <if test="type==6">
|
|
|
+ JOIN (
|
|
|
+ SELECT pr.main_id
|
|
|
+ FROM public_release pr
|
|
|
+ JOIN admin_public_reviewer apr ON pr.aid = apr.aid
|
|
|
+ WHERE pr.`type` IN (3, 6)
|
|
|
+ AND apr.type = 1
|
|
|
+ AND apr.reviewer_id = #{aid}
|
|
|
+ ) sub ON a.id = sub.main_id
|
|
|
+ </if>
|
|
|
<if test="type==7">
|
|
|
left join t_order_public_release_count opc on a.order_no=opc.order_no
|
|
|
</if>
|