|
@@ -361,9 +361,7 @@
|
|
|
<if test="name != null and name != ''">
|
|
|
and t.name like concat('%',#{name},'%')
|
|
|
</if>
|
|
|
- and toer.status = 'FIRST_PREPARE'
|
|
|
- and (toer.first_start_time is null
|
|
|
- or toer.first_prepare_time is null)
|
|
|
+ and (toer.first_start_time is null or toer.first_prepare_time is null)
|
|
|
and not exists(
|
|
|
select
|
|
|
*
|
|
@@ -377,8 +375,8 @@
|
|
|
t.exam_student_id = s.id
|
|
|
where
|
|
|
t.exam_id = #{examId}
|
|
|
- and (t.STATUS = 'FINISHED'
|
|
|
- or t.STATUS = 'PERSISTED')
|
|
|
+ and (t.STATUS = 'FINISHED' or t.STATUS = 'PERSISTED')
|
|
|
+ and t.first_start_time is not null
|
|
|
and t.exam_activity_id in
|
|
|
<foreach collection="activityIds" item="acid" index="index"
|
|
|
open="(" close=")" separator=",">
|