|
@@ -195,7 +195,7 @@
|
|
|
AND eb.status_='EXAM_END'
|
|
|
</if>
|
|
|
<if test="examMode!=null">
|
|
|
- AND er.exam_mode_ = #{examMode, typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
|
|
|
+ AND ero.exam_mode_ = #{examMode, typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
|
|
|
</if>
|
|
|
<!--<if test="resultConfirm==null">-->
|
|
|
<!--AND eb.status_ IN ('EXAM_ING', 'EXAM_END','RESULT_CONFIRM')-->
|
|
@@ -217,7 +217,7 @@
|
|
|
LEFT JOIN examination_basic eb ON ser.examination_basic_id_=eb.id_
|
|
|
LEFT JOIN exam_registration er ON ser.exam_registration_id_=er.id_
|
|
|
LEFT JOIN sys_user su ON ser.student_id_=su.id_
|
|
|
- LEFT JOIN exam_room er ON ser.exam_room_id_=er.id_
|
|
|
+ LEFT JOIN exam_room ero ON ser.exam_room_id_=ero.id_
|
|
|
<include refid="queryStudentExamResultCondition"/>
|
|
|
ORDER BY er.id_ <include refid="global.limit"/>
|
|
|
</select>
|
|
@@ -230,7 +230,7 @@
|
|
|
LEFT JOIN examination_basic eb ON ser.examination_basic_id_=eb.id_
|
|
|
LEFT JOIN exam_registration er ON ser.exam_registration_id_=er.id_
|
|
|
LEFT JOIN sys_user su ON ser.student_id_=su.id_
|
|
|
- LEFT JOIN exam_room er ON ser.exam_room_id_=er.id_
|
|
|
+ LEFT JOIN exam_room ero ON ser.exam_room_id_=ero.id_
|
|
|
<include refid="queryStudentExamResultCondition"/>
|
|
|
</select>
|
|
|
|