|
|
@@ -395,7 +395,7 @@
|
|
|
left join t_order_mid tom on a.order_no=tom.order_no
|
|
|
</if>
|
|
|
<if test="type==6">
|
|
|
- left join admin_public_reviewer apr on a.aid=apr.aid and apr.reviewer_id= #{aid}
|
|
|
+ left join admin_public_reviewer apr on a.aid=apr.aid
|
|
|
</if>
|
|
|
where 1=1
|
|
|
<include refid="listPublicReleaseSql"/>
|
|
|
@@ -467,6 +467,7 @@
|
|
|
</if>
|
|
|
<if test="type==6">
|
|
|
and a.type=3 and a.assist=2
|
|
|
+ and apr.reviewer_id= #{aid}
|
|
|
</if>
|
|
|
<if test="clockIn !=null">
|
|
|
and a.clock_in =#{clockIn}
|
|
|
@@ -496,6 +497,9 @@
|
|
|
left join public_release_details b on a.id=b.prid
|
|
|
left join user e on b.uid=e.id left join admin ad on e.aid=ad.id
|
|
|
</if>
|
|
|
+ <if test="type==6">
|
|
|
+ left join admin_public_reviewer apr on a.aid=apr.aid
|
|
|
+ </if>
|
|
|
where 1=1
|
|
|
<include refid="listPublicReleaseSql"/>
|
|
|
</select>
|
|
|
@@ -827,9 +831,9 @@
|
|
|
<select id="selectCountByAssistUnaudited" resultType="java.lang.Integer">
|
|
|
SELECT count(*)
|
|
|
from public_release a left join admin_public_reviewer b on a.aid =b.aid
|
|
|
- and b.type =1 and b.reviewer_id = #{aid}
|
|
|
+ and b.type =1
|
|
|
where a.`type`=3 and a.assist =2 and a.status =1
|
|
|
-
|
|
|
+ and b.reviewer_id = #{aid}
|
|
|
</select>
|
|
|
<select id="selectCountByUnaudited" resultType="java.lang.Integer">
|
|
|
select COUNT(*)
|