zouxuan пре 5 година
родитељ
комит
be29c61cf9

+ 7 - 8
edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dto/ExamReviewRecordDto.java

@@ -1,6 +1,5 @@
 package com.keao.edu.user.dto;
 
-import com.keao.edu.user.enums.ExamStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 public class ExamReviewRecordDto {
@@ -8,15 +7,15 @@ public class ExamReviewRecordDto {
     @ApiModelProperty(value = "学员报名编号")
     private Long examRegistrationId;
 
-    @ApiModelProperty(value = "项目状态")
-    private ExamStatusEnum examBasicStatus;
-
     @ApiModelProperty(value = "学员名称")
     private String realName;
 
     @ApiModelProperty(value = "学员编号")
     private Integer studentId;
 
+    @ApiModelProperty(value = "是否开启考场")
+    private Integer openFlag;
+
     @ApiModelProperty(value = "是否录制")
     private Integer recordFlag;
 
@@ -41,12 +40,12 @@ public class ExamReviewRecordDto {
     @ApiModelProperty(value = "评审编号")
     private Integer examReviewId;
 
-    public ExamStatusEnum getExamBasicStatus() {
-        return examBasicStatus;
+    public Integer getOpenFlag() {
+        return openFlag;
     }
 
-    public void setExamBasicStatus(ExamStatusEnum examBasicStatus) {
-        this.examBasicStatus = examBasicStatus;
+    public void setOpenFlag(Integer openFlag) {
+        this.openFlag = openFlag;
     }
 
     public Long getExamRegistrationId() {

+ 3 - 3
edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamReviewMapper.xml

@@ -204,7 +204,7 @@
 		<result property="finishedExam" column="is_finished_exam_"/>
 		<result property="videoUrl" column="video_url_"/>
 		<result property="examRegistrationId" column="exam_registration_id_"/>
-		<result property="examBasicStatus" column="status_" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
+		<result property="openFlag" column="open_flag_"/>
 	</resultMap>
 	<sql id="queryExamReviewRecordListSql">
 		<where>
@@ -225,9 +225,9 @@
 
 	<select id="queryExamReviewRecordList" resultMap="ExamReviewRecordDtoMap">
 		SELECT ser.is_finished_exam_,ser.record_flag_,ser.confirm_status_,er.evaluation_content_,
-		er.evaluation_result_,ersr.exam_registration_id_,er.id_,ersr.student_id_,ser.video_url_,eb.status_
+		er.evaluation_result_,ersr.exam_registration_id_,er.id_,ersr.student_id_,ser.video_url_,erm.open_flag_
 		FROM exam_room_student_relation ersr
-		LEFT JOIN examination_basic eb ON eb.id_ = ersr.examination_basic_id_
+		LEFT JOIN exam_room erm ON erm.id_ = ersr.exam_room_id_
 		LEFT JOIN student_exam_result ser ON ser.exam_registration_id_ = ersr.exam_registration_id_
 		LEFT JOIN exam_review er ON ser.exam_registration_id_ = er.exam_registration_id_ AND er.teacher_id_ = #{teacherId}
 		<include refid="queryExamReviewRecordListSql"/>