update

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dto/ExamRegistrationRoomDto.java

@@ -20,7 +20,7 @@ public class ExamRegistrationRoomDto extends ExamRegistration {
     @ApiModelProperty(value = "考试结束时间")
     private Date examEndTime;
 
-    @ApiModelProperty(value = "是否完成考试")
+    @ApiModelProperty(value = "考试状态")
     private Integer isFinishedExam;
 
     public Long getExamRoomId() {

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

@@ -37,6 +37,9 @@ public class ExamRegistrationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否已排考:0否，1已排考")
     private Integer inRoom;
 
+    @ApiModelProperty(value = "学员考试状态")
+    private Integer isFinishedExam;
+
     public Integer getExamRegistrationId() {
         return examRegistrationId;
     }
@@ -101,6 +104,14 @@ public class ExamRegistrationQueryInfo extends QueryInfo {
         this.status = status;
     }
 
+    public Integer getIsFinishedExam() {
+        return isFinishedExam;
+    }
+
+    public void setIsFinishedExam(Integer isFinishedExam) {
+        this.isFinishedExam = isFinishedExam;
+    }
+
     public Integer getInRoom() {
         return inRoom;
     }

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

@@ -38,6 +38,7 @@
 		<result column="exam_room_id_" property="examRoomId"/>
 		<result column="exam_start_time_" property="examStartTime"/>
 		<result column="exam_end_time_" property="examEndTime"/>
+		<result column="is_finished_exam_" property="isFinishedExam"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -233,6 +234,9 @@
 			<if test="status!=null">
 				AND er.status_ = #{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
 			</if>
+			<if test="isFinishedExam!=null">
+				AND ser.is_finished_exam_ = #{isFinishedExam}
+			</if>
 			<if test="search!=null and search!=''">
 				AND (er.student_id_=#{search} OR su.phone_ LIKE CONCAT('%', #{search}, '%') OR su.real_name_ LIKE CONCAT('%', #{search}, '%') OR eb.name_ LIKE CONCAT('%', #{search}, '%'))
 			</if>
@@ -336,6 +340,7 @@
 			LEFT JOIN exam_room_student_relation ersr ON ersr.exam_registration_id_ = er.id_
 			LEFT JOIN exam_room ero ON ero.id_ = ersr.exam_room_id_
 			LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
+			LEFT JOIN student_exam_result ser ON ser.exam_registration_id_=er.id_
 		<include refid="queryCondition"/>
 		ORDER BY er.id_ DESC
 		<include refid="global.limit"/>
@@ -346,6 +351,7 @@
 		LEFT JOIN sys_user su ON er.student_id_ = su.id_
 		LEFT JOIN exam_room_student_relation ersr ON ersr.exam_registration_id_ = er.id_
 		LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
+		LEFT JOIN student_exam_result ser ON ser.exam_registration_id_=er.id_
 		<include refid="queryCondition"/>
 	</select>