|
@@ -295,9 +295,8 @@
|
|
|
left join t_b_exam_invigilate_user tbeiu on tbeiu.exam_id = tees.exam_id
|
|
left join t_b_exam_invigilate_user tbeiu on tbeiu.exam_id = tees.exam_id
|
|
|
</if>
|
|
</if>
|
|
|
<where> 1 = 1
|
|
<where> 1 = 1
|
|
|
- and tee.monitor_status <![CDATA[ <> ]]> 'FINISHED'
|
|
|
|
|
<if test="examId != null and examId != ''">
|
|
<if test="examId != null and examId != ''">
|
|
|
- and toer.exam_id = #{examId}
|
|
|
|
|
|
|
+ and tees.exam_id = #{examId}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="userId != null and userId != ''">
|
|
<if test="userId != null and userId != ''">
|
|
|
and tbeiu.user_id = #{userId}
|
|
and tbeiu.user_id = #{userId}
|
|
@@ -338,6 +337,7 @@
|
|
|
<if test="maxExceptionCount != null and maxExceptionCount != '' or maxExceptionCount == 0">
|
|
<if test="maxExceptionCount != null and maxExceptionCount != '' or maxExceptionCount == 0">
|
|
|
and toer.exception_count <= #{maxExceptionCount}
|
|
and toer.exception_count <= #{maxExceptionCount}
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ and tee.monitor_status <![CDATA[ <> ]]> 'FINISHED'
|
|
|
</where>
|
|
</where>
|
|
|
order by tiiwi.approve_status,CAST(teea.code AS UNSIGNED),CAST(tees.room_code AS UNSIGNED)
|
|
order by tiiwi.approve_status,CAST(teea.code AS UNSIGNED),CAST(tees.room_code AS UNSIGNED)
|
|
|
</select>
|
|
</select>
|
|
@@ -438,7 +438,7 @@
|
|
|
</if>
|
|
</if>
|
|
|
<where>1 = 1
|
|
<where>1 = 1
|
|
|
<if test="examId != null and examId != ''">
|
|
<if test="examId != null and examId != ''">
|
|
|
- and t.exam_id = #{examId}
|
|
|
|
|
|
|
+ and tees.exam_id = #{examId}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="userId != null and userId != ''">
|
|
<if test="userId != null and userId != ''">
|
|
|
and tbeiu.user_id = #{userId}
|
|
and tbeiu.user_id = #{userId}
|
|
@@ -517,7 +517,7 @@
|
|
|
</if>
|
|
</if>
|
|
|
<where>1 = 1
|
|
<where>1 = 1
|
|
|
<if test="examId != null and examId != ''">
|
|
<if test="examId != null and examId != ''">
|
|
|
- and t.exam_id = #{examId}
|
|
|
|
|
|
|
+ and tees.exam_id = #{examId}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="userId != null and userId != ''">
|
|
<if test="userId != null and userId != ''">
|
|
|
and tbeiu.user_id = #{userId}
|
|
and tbeiu.user_id = #{userId}
|
wangliang