update

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/page/StudentExamResultQueryInfo.java

@@ -2,6 +2,7 @@ package com.keao.edu.user.page;
 
 import com.keao.edu.common.page.QueryInfo;
 import com.keao.edu.user.api.enums.ExamEvaluationResultEnum;
+import com.keao.edu.user.api.enums.ExamModeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -51,6 +52,9 @@ public class StudentExamResultQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "考级项目状态")
     private Integer resultConfirm;
 
+    @ApiModelProperty(value = "考试模式")
+    private ExamModeEnum examMode;
+
     public Integer getStudentId() {
         return studentId;
     }
@@ -154,4 +158,12 @@ public class StudentExamResultQueryInfo extends QueryInfo {
     public void setResultConfirm(Integer resultConfirm) {
         this.resultConfirm = resultConfirm;
     }
+
+    public ExamModeEnum getExamMode() {
+        return examMode;
+    }
+
+    public void setExamMode(ExamModeEnum examMode) {
+        this.examMode = examMode;
+    }
 }

edu-user/edu-user-biz/src/main/resources/config/mybatis/StudentExamResultMapper.xml

@@ -194,6 +194,9 @@
 			<if test="resultConfirm!=null and resultConfirm==0">
 				AND eb.status_='EXAM_END'
 			</if>
+			<if test="examMode!=null">
+				AND er.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')-->
 			<!--</if>-->
@@ -214,6 +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_
 		<include refid="queryStudentExamResultCondition"/>
 		ORDER BY er.id_ <include refid="global.limit"/>
 	</select>
@@ -226,6 +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_
 		<include refid="queryStudentExamResultCondition"/>
 	</select>