update

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dao/ExamCertificationDao.java

@@ -15,11 +15,10 @@ public interface ExamCertificationDao extends BaseDAO<Long, ExamCertification> {
 
     /**
      * 获取学员准考证
-     * @param studentId
      * @param examRegistrationId
      * @return
      */
-    ExamCertification findByStuAndBasicId(@Param("studentId") Integer studentId, @Param("examRegistrationId") Long examRegistrationId);
+    ExamCertification findByStuAndBasicId(@Param("examRegistrationId") Long examRegistrationId);
 
     int updateExamAddress(@Param("address") String address,
                           @Param("registIds") List<Long> registIds);

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

@@ -37,6 +37,12 @@ public class NeedCheckingDetailDto {
     @ApiModelProperty(value = "考试名称")
     private String baseExamName;
 
+    @ApiModelProperty(value = "级别")
+    private Integer level;
+
+    @ApiModelProperty(value = "声部")
+    private String subjectName;
+
     @ApiModelProperty(value = "房间编号")
     private Long examRoomId;
 
@@ -46,6 +52,22 @@ public class NeedCheckingDetailDto {
     @ApiModelProperty(value = "机构")
     private String tenantId;
 
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
     public String getTenantId() {
         return tenantId;
     }

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

@@ -15,11 +15,10 @@ public interface ExamCertificationService extends BaseService<Long, ExamCertific
 
     /**
      * 获取学员准考证
-     * @param studentId
      * @param examRegistrationId
      * @return
      */
-    ExamCertification findByStuAndBasicId(Integer studentId,Long examRegistrationId);
+    ExamCertification findByStuAndBasicId(Long examRegistrationId);
 
     /**
      * 获取学员的准考证列表

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

@@ -10,6 +10,7 @@ import com.keao.edu.user.dao.*;
 import com.keao.edu.user.dto.ExamCertificationDto;
 import com.keao.edu.user.dto.NeedCheckingDetailDto;
 import com.keao.edu.user.entity.ExamCertification;
+import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.entity.StudentExamResult;
 import com.keao.edu.user.entity.Subject;
 import com.keao.edu.user.service.ExamCertificationService;
@@ -29,6 +30,8 @@ public class ExamCertificationServiceImpl extends BaseServiceImpl<Long, ExamCert
 	@Autowired
 	private ExamCertificationDao examCertificationDao;
 	@Autowired
+	private ExamRegistrationDao examRegistrationDao;
+	@Autowired
 	private ExamRoomStudentRelationDao examRoomStudentRelationDao;
 	@Autowired
 	private SubjectDao subjectDao;
@@ -47,8 +50,8 @@ public class ExamCertificationServiceImpl extends BaseServiceImpl<Long, ExamCert
 	}
 
 	@Override
-	public ExamCertification findByStuAndBasicId(Integer studentId, Long examRegistrationId) {
-		return examCertificationDao.findByStuAndBasicId(studentId,examRegistrationId);
+	public ExamCertification findByStuAndBasicId(Long examRegistrationId) {
+		return examCertificationDao.findByStuAndBasicId(examRegistrationId);
 	}
 
 	@Override
@@ -80,6 +83,9 @@ public class ExamCertificationServiceImpl extends BaseServiceImpl<Long, ExamCert
 		Integer waitNum = examRoomStudentRelationDao.sumWaitNum(needCheckingDetailDto.getExamRoomId(),signInTime,sysUser.getId(),needCheckingDetailDto.getExamRoomStudentRelationId());
 		needCheckingDetailDto.setWaitNum(waitNum);
 		needCheckingDetailDto.setDesc(sysConfigService.findConfigValue("exam_room_desc",needCheckingDetailDto.getTenantId()));
+		ExamRegistration examRegistration = examRegistrationDao.get(examRegistrationId);
+		needCheckingDetailDto.setSubjectName(subjectDao.get(examRegistration.getId()).getName());
+		needCheckingDetailDto.setLevel(examRegistration.getLevel());
 		return needCheckingDetailDto;
 	}
 

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

@@ -118,7 +118,7 @@
 	</select>
 
     <select id="findByStuAndBasicId" resultMap="ExamCertification">
-		SELECT * FROM exam_certification WHERE exam_registration_id_ = #{examRegistrationId} AND student_id_ = #{studentId} LIMIT 1
+		SELECT * FROM exam_certification WHERE exam_registration_id_ = #{examRegistrationId} LIMIT 1
 	</select>
 
 	<select id="getExamCertificationDto" resultMap="ExamCertificationDtoMap">
@@ -173,7 +173,8 @@
 	</resultMap>
 	<select id="needCheckingDetail" resultMap="NeedCheckingDetailDtoMap">
 		SELECT ersr.id_ exam_room_student_relation_id_,eb.name_ exam_base_name_,er.exam_start_time_,er.exam_end_time_,er.open_flag_,
-		ser.is_finished_exam_,ersr.exam_room_id_,ersr.sign_in_time_,ersr.classroom_switch_,ersr.exam_registration_id_,ser.record_flag_,ser.tenant_id_
+		ser.is_finished_exam_,ersr.exam_room_id_,ersr.sign_in_time_,ersr.classroom_switch_,
+		ersr.exam_registration_id_,ser.record_flag_,ser.tenant_id_
 		FROM exam_room_student_relation ersr
 		LEFT JOIN examination_basic eb ON eb.id_ = ersr.examination_basic_id_
 		LEFT JOIN exam_room er ON er.id_ = ersr.exam_room_id_