zouxuan il y a 5 ans
Parent
commit
fd72fc1c93

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

@@ -84,9 +84,6 @@ public class ExamCertificationServiceImpl extends BaseServiceImpl<Long, ExamCert
 		String signInTime = needCheckingDetailDto.getSignInTime();
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		Integer waitNum = examRoomStudentRelationDao.sumWaitNum(needCheckingDetailDto.getExamRoomId(),signInTime,sysUser.getId(),needCheckingDetailDto.getExamRoomStudentRelationId());
-		if(waitNum > 0){
-			waitNum = waitNum - 1;
-		}
 		needCheckingDetailDto.setWaitNum(waitNum);
 		needCheckingDetailDto.setDesc(sysConfigService.findConfigValue("exam_room_desc",needCheckingDetailDto.getTenantId()));
 		ExamRegistration examRegistration = examRegistrationDao.get(examRegistrationId);

+ 8 - 1
edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamRoomStudentRelationServiceImpl.java

@@ -648,7 +648,14 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 			SysUser sysUser = sysUserFeignService.queryUserInfo();
 			//当前用户是呼叫中或者考试中
 			if(roomStudentListDto.getFinishedExam() == 0 || roomStudentListDto.getFinishedExam() == 1){
-				currentStudent(roomStudentListDto.getExamRoomStudentRelationId(),true,examStatus,sysUser.getId());
+				boolean isPush = true;
+				if(roomStudentListDtos.size() > 1){
+					RoomStudentListDto roomStudentListDto1 = roomStudentListDtos.get(1);
+					if(roomStudentListDto1.getFinishedExam() == 2){
+						isPush = false;
+					}
+				}
+				currentStudent(roomStudentListDto.getExamRoomStudentRelationId(),isPush,examStatus,sysUser.getId());
 				//考试中
 				if(roomStudentListDtos.size() > 1){
 					RoomStudentListDto roomStudentListDto1 = roomStudentListDtos.get(1);