update

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

@@ -810,15 +810,17 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		//加群退群
 		if(openFlag == 1){
 			String studentIds = examRoomStudentRelationService.getStudentIds(examRoomId);
-			StringBuffer stringBuffer = new StringBuffer();
+			imFeignService.joinGroup(studentIds,examRoomId.toString(),examRoomId.toString());
+
+			/*StringBuffer stringBuffer = new StringBuffer();
 			stringBuffer.append(examRoom.getMainTeacherUserId());
 			if(StringUtils.isNotEmpty(studentIds)){
 				stringBuffer.append(",").append(studentIds);
 			}
 			if(StringUtils.isNotEmpty(examRoom.getAssistantTeacherUserIdList())){
 				stringBuffer.append(",").append(examRoom.getAssistantTeacherUserIdList());
-			}
-			imFeignService.joinGroup(stringBuffer.toString(),examRoomId.toString(),examRoomId.toString());
+			}*/
+
 			PublishMessageDto publishMessageDto = new PublishMessageDto();
 			publishMessageDto.setUserId(sysUser.getId().toString());
 			publishMessageDto.setRoomId(examRoomId.toString());

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

@@ -649,12 +649,13 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 			//当前用户是呼叫中或者考试中
 			if(roomStudentListDto.getFinishedExam() == 0 || roomStudentListDto.getFinishedExam() == 1){
 				//考试中
-				currentStudent(roomStudentListDto.getExamRoomStudentRelationId(),true,examStatus,sysUser.getId());
 				if(roomStudentListDtos.size() > 1){
 					RoomStudentListDto roomStudentListDto1 = roomStudentListDtos.get(1);
 					if(roomStudentListDto1.getFinishedExam() == 2){
-						nextStudent(roomStudentListDto1.getExamRoomStudentRelationId(),false,sysUser.getId());
+						nextStudent(roomStudentListDto1.getExamRoomStudentRelationId(),true,sysUser.getId());
 					}
+				}else {
+					currentStudent(roomStudentListDto.getExamRoomStudentRelationId(),true,examStatus,sysUser.getId());
 				}
 				roomStudentListDtos.remove(0);
 				//当前用户是已签到