Joburgess 5 tahun lalu
induk
melakukan
2c11091dca

+ 12 - 0
edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dto/StudentExamListDto.java

@@ -1,6 +1,7 @@
 package com.keao.edu.user.dto;
 
 import com.keao.edu.user.api.enums.ExamEvaluationResultEnum;
+import com.keao.edu.user.enums.ExamStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -18,6 +19,9 @@ public class StudentExamListDto{
     @ApiModelProperty(value = "考级项目编号")
     private Long examinationBasicId;
 
+    @ApiModelProperty(value = "考级项目状态")
+    private ExamStatusEnum examStatus;
+
     @ApiModelProperty(value = "准考证号")
     private String cardNo;
 
@@ -105,6 +109,14 @@ public class StudentExamListDto{
         this.examinationBasicId = examinationBasicId;
     }
 
+    public ExamStatusEnum getExamStatus() {
+        return examStatus;
+    }
+
+    public void setExamStatus(ExamStatusEnum examStatus) {
+        this.examStatus = examStatus;
+    }
+
     public String getSubjectName() {
         return subjectName;
     }

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

@@ -510,6 +510,7 @@
 	<resultMap id="ExamRecordDtoMap" type="com.keao.edu.user.dto.StudentExamListDto">
 		<result property="level" column="level_"/>
 		<result property="examRegistrationId" column="exam_registration_id_"/>
+		<result property="examStatus" column="exam_status_"/>
 		<result property="examBaseName" column="exam_base_name_"/>
 		<result property="actualExamEndTime" column="actual_exam_end_time_"/>
 		<result property="actualExamStartTime" column="actual_exam_start_time_"/>
@@ -526,7 +527,7 @@
 		<result property="cardNo" column="card_no_"/>
 	</resultMap>
 	<select id="queryExamList" resultMap="ExamRecordDtoMap">
-		SELECT er.level_,ser.exam_registration_id_,eb.name_ exam_base_name_,DATE_FORMAT(eb.actual_exam_start_time_, '%Y-%m-%d') actual_exam_start_time_,
+		SELECT er.level_,ser.exam_registration_id_,eb.status_ exam_status_,eb.name_ exam_base_name_,DATE_FORMAT(eb.actual_exam_start_time_, '%Y-%m-%d') actual_exam_start_time_,
 		DATE_FORMAT(eb.actual_exam_end_time_, '%Y-%m-%d') actual_exam_end_time_,ser.avg_score_,ec.exam_address_,ec.id_ exam_certification_id_,
 		er.examination_basic_id_,er.exam_music_theory_level_,ser.is_finished_exam_,er.theory_level_fee_,
 		ser.video_url_,ser.result_,er.subject_id_,ec.card_no_