update

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

@@ -1,5 +1,6 @@
 package com.keao.edu.user.dto;
 
+import com.keao.edu.user.enums.ExamStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 public class ExamReviewRecordDto {
@@ -7,6 +8,9 @@ public class ExamReviewRecordDto {
     @ApiModelProperty(value = "学员报名编号")
     private Long examRegistrationId;
 
+    @ApiModelProperty(value = "项目状态")
+    private ExamStatusEnum examBasicStatus;
+
     @ApiModelProperty(value = "学员名称")
     private String realName;
 
@@ -37,6 +41,14 @@ public class ExamReviewRecordDto {
     @ApiModelProperty(value = "评审编号")
     private Integer examReviewId;
 
+    public ExamStatusEnum getExamBasicStatus() {
+        return examBasicStatus;
+    }
+
+    public void setExamBasicStatus(ExamStatusEnum examBasicStatus) {
+        this.examBasicStatus = examBasicStatus;
+    }
+
     public Long getExamRegistrationId() {
         return examRegistrationId;
     }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamSubjectServiceImpl.java

@@ -12,6 +12,7 @@ import com.keao.edu.user.service.ExamSubjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -40,6 +41,10 @@ public class ExamSubjectServiceImpl extends BaseServiceImpl<Long, ExamSubject> i
 	@Override
 	public List<Subject> getStudentExamSubjects(Integer examId) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		return examSubjectDao.getStudentExamSubjects(examId,sysUser.getId());
+		List<Subject> studentExamSubjects = examSubjectDao.getStudentExamSubjects(examId, sysUser.getId());
+		if(studentExamSubjects == null || studentExamSubjects.size() == 0){
+			return new ArrayList<>();
+		}
+		return studentExamSubjects;
 	}
 }

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

@@ -204,6 +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"/>
 	</resultMap>
 	<sql id="queryExamReviewRecordListSql">
 		<where>
@@ -224,8 +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_
+		er.evaluation_result_,ersr.exam_registration_id_,er.id_,ersr.student_id_,ser.video_url_,eb.status_
 		FROM exam_room_student_relation ersr
+		LEFT JOIN examination_basic eb ON eb.id_ = ersr.examination_basic_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"/>