|
|
@@ -349,6 +349,8 @@
|
|
|
e.name teachingRoomName
|
|
|
FROM
|
|
|
exam_task a
|
|
|
+ left join t_exam_task_flow tetf on
|
|
|
+ a.id = tetf.exam_task_id
|
|
|
LEFT JOIN
|
|
|
basic_card_rule b ON a.card_rule_id = b.id
|
|
|
LEFT JOIN
|
|
|
@@ -364,7 +366,7 @@
|
|
|
<where>
|
|
|
a.enable = true and a.review = true
|
|
|
and (f.status = 'AUDITING' or f.status = 'REJECT' or f.status = 'FINISH')
|
|
|
- and EXISTS (
|
|
|
+ and tetf.flow_id in (
|
|
|
select
|
|
|
aht.PROC_INST_ID_
|
|
|
from
|
|
|
@@ -403,8 +405,7 @@
|
|
|
tffal.task_id = tetf.exam_task_id
|
|
|
where (tffal.primary_approve_id = #{currentUserId} or tffal.second_approve_id = #{currentUserId}
|
|
|
OR tffal.three_approve_id = #{currentUserId}
|
|
|
- OR tffal.four_approve_id = #{currentUserId})
|
|
|
- AND t.PROC_INST_ID_ = tetf.flow_id)
|
|
|
+ OR tffal.four_approve_id = #{currentUserId}))
|
|
|
<if test="schoolId != null and schoolId != ''">
|
|
|
and a.school_id = #{schoolId}
|
|
|
</if>
|
wangliang