|
@@ -296,7 +296,7 @@
|
|
left join t_ie_invigilate_warn_info tiiwi on tees.id = tiiwi.exam_student_id
|
|
left join t_ie_invigilate_warn_info tiiwi on tees.id = tiiwi.exam_student_id
|
|
left join t_e_exam tee on tee.id = tiiwi.exam_id
|
|
left join t_e_exam tee on tee.id = tiiwi.exam_id
|
|
left join t_e_exam_activity teea on teea.id = tiiwi.exam_activity_id
|
|
left join t_e_exam_activity teea on teea.id = tiiwi.exam_activity_id
|
|
- left join t_oe_exam_record toer on toer.id = tiiwi.exam_record_id and (toer.id = tees.current_record_id or tees.already_exam_count > 0)
|
|
|
|
|
|
+ left join t_oe_exam_record toer on toer.id = tiiwi.exam_record_id
|
|
<if test="userId != null and userId != ''">
|
|
<if test="userId != null and userId != ''">
|
|
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>
|
|
@@ -517,7 +517,7 @@
|
|
left join t_e_exam_activity teea on
|
|
left join t_e_exam_activity teea on
|
|
teea.id = tees.exam_activity_id
|
|
teea.id = tees.exam_activity_id
|
|
left join t_e_student tes on tees.student_id = tes.id
|
|
left join t_e_student tes on tees.student_id = tes.id
|
|
- left join t_oe_exam_record t on t.id = tees.current_record_id or tees.already_exam_count > 0
|
|
|
|
|
|
+ left join t_oe_exam_record t on t.exam_student_id = tees.id
|
|
t.exam_student_id = tees.id
|
|
t.exam_student_id = tees.id
|
|
<if test="userId != null and userId != ''">
|
|
<if test="userId != null and userId != ''">
|
|
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
|
|
@@ -612,7 +612,7 @@
|
|
teea.id = s.exam_activity_id
|
|
teea.id = s.exam_activity_id
|
|
left join t_e_student tes on
|
|
left join t_e_student tes on
|
|
s.student_id = tes.id
|
|
s.student_id = tes.id
|
|
- left join t_oe_exam_record toer on toer.id = s.current_record_id
|
|
|
|
|
|
+ left join t_oe_exam_record toer on toer.exam_student_id = s.id
|
|
<if test="userId != null and userId != ''">
|
|
<if test="userId != null and userId != ''">
|
|
left join t_b_exam_invigilate_user tbeiu on tbeiu.exam_id = s.exam_id
|
|
left join t_b_exam_invigilate_user tbeiu on tbeiu.exam_id = s.exam_id
|
|
</if>
|
|
</if>
|