|
@@ -431,7 +431,7 @@
|
|
|
and a.public_type in (0,2)
|
|
and a.public_type in (0,2)
|
|
|
and a.assist in(0,1)
|
|
and a.assist in(0,1)
|
|
|
and a.tech_start_process in (0,2)
|
|
and a.tech_start_process in (0,2)
|
|
|
- and apr.reviewer_id = #{aid}
|
|
|
|
|
|
|
+ and apr.reviewer_id = #{aid} and apr.type=0
|
|
|
</if>
|
|
</if>
|
|
|
<if test="type==2">
|
|
<if test="type==2">
|
|
|
and a.public_type in (0,2)
|
|
and a.public_type in (0,2)
|
|
@@ -463,7 +463,7 @@
|
|
|
</if>
|
|
</if>
|
|
|
<if test="type==6">
|
|
<if test="type==6">
|
|
|
and a.type=3 and a.assist=2
|
|
and a.type=3 and a.assist=2
|
|
|
- and apr.reviewer_id= #{aid}
|
|
|
|
|
|
|
+ and apr.reviewer_id= #{aid} and apr.type=1
|
|
|
</if>
|
|
</if>
|
|
|
<if test="clockIn !=null">
|
|
<if test="clockIn !=null">
|
|
|
and a.clock_in =#{clockIn}
|
|
and a.clock_in =#{clockIn}
|