update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRoomStudentRelationController.java

@@ -7,6 +7,7 @@ import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
 import com.keao.edu.user.dto.ExamRoomStudentRelationDto;
+import com.keao.edu.user.dto.NeedCheckingDetailDto;
 import com.keao.edu.user.dto.RoomStudentListDto;
 import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.page.ExamRoomStudentRelationQueryInfo;
@@ -65,9 +66,14 @@ public class ExamRoomStudentRelationController extends BaseController {
 
     @ApiOperation("学生端去录播")
     @PostMapping(value = "/stuRecorded")
-    public HttpResponseResult stuRecorded(Long examRoomStudentRelationId) {
-        examRoomStudentRelationService.stuRecorded(examRoomStudentRelationId);
-        return succeed();
+    public HttpResponseResult<NeedCheckingDetailDto> stuRecorded(Long examRegistrationId) {
+        return succeed(examRoomStudentRelationService.stuRecorded(examRegistrationId));
+    }
+
+    @ApiOperation("学生端重新排队")
+    @PostMapping(value = "/againQueue")
+    public HttpResponseResult<NeedCheckingDetailDto> againQueue(Long examRegistrationId) {
+        return succeed(examRoomStudentRelationService.againQueue(examRegistrationId));
     }
 
     @ApiOperation("获取后台考场待考队列")

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRoomStudentRelationService.java

@@ -4,6 +4,7 @@ import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
 import com.keao.edu.user.dto.ExamRoomStudentRelationDto;
 import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
+import com.keao.edu.user.dto.NeedCheckingDetailDto;
 import com.keao.edu.user.dto.RoomStudentListDto;
 import com.keao.edu.user.page.ExamRoomStudentRelationQueryInfo;
 
@@ -104,7 +105,13 @@ public interface ExamRoomStudentRelationService extends BaseService<Long, ExamRo
 
     /**
      * 学生端去录播
-     * @param examRoomStudentRelationId
+     * @param examRegistrationId
+     */
+    NeedCheckingDetailDto stuRecorded(Long examRegistrationId);
+
+    /**
+     * 重新排队
+     * @param examRegistrationId
      */
-    void stuRecorded(Long examRoomStudentRelationId);
+    NeedCheckingDetailDto againQueue(Long examRegistrationId);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomStudentRelationServiceImpl.java

@@ -23,6 +23,7 @@ import com.keao.edu.user.api.enums.ExamModeEnum;
 import com.keao.edu.user.controller.WebSocketServer;
 import com.keao.edu.user.dao.*;
 import com.keao.edu.user.dto.ExamRoomStudentRelationDto;
+import com.keao.edu.user.dto.NeedCheckingDetailDto;
 import com.keao.edu.user.dto.RoomStudentListDto;
 import com.keao.edu.user.entity.*;
 import com.keao.edu.user.page.ExamRoomStudentRelationQueryInfo;
@@ -297,11 +298,22 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void stuRecorded(Long examRegistrationId) {
+	public NeedCheckingDetailDto stuRecorded(Long examRegistrationId) {
 		//修改考试状态为录播
 		StudentExamResult studentExamResult = studentExamResultDao.findByRegistrationId(examRegistrationId);
 		studentExamResult.setRecordFlag(1);
 		studentExamResultDao.update(studentExamResult);
+		//返回详情数据
+		return examCertificationService.needCheckingDetail(examRegistrationId);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public NeedCheckingDetailDto againQueue(Long examRegistrationId) {
+		//清除排队状态
+		examRoomStudentRelationDao.cleanSignInTime(examRegistrationId);
+		//返回详情数据
+		return examCertificationService.needCheckingDetail(examRegistrationId);
 	}
 
 	@Override

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/StudentExamResultServiceImpl.java

@@ -122,7 +122,7 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 	public StudentExamResultApiDto getStudentExamResultApiDto(Long id) {
 		StudentExamResultApiDto resultApiDto = studentExamResultDao.getStudentExamResultApiDto(id);
 		ExamRoomStudentRelation studentExamRoom = examRoomStudentRelationDao.getStudentExamRoom(id);
-		resultApiDto.setRoomId(studentExamRoom.getId().toString());
+		resultApiDto.setRoomId(studentExamRoom.getExamRoomId().toString());
 		return resultApiDto;
 	}
 }