Merge remote-tracking branch 'origin/master'

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

@@ -691,8 +691,11 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		examRoom.setOpenFlag(openFlag);
 		if(openFlag == 0){
 			examRoom.setExamFlag(openFlag);
+			Integer num = examRoomStudentRelationService.countSignInNum(examRoomId);
+			if(num != null && num > 0){
+				throw new BizException("操作失败，当前还有学员未考试");
+			}
 		}
-		examRoomStudentRelationService.countSignInNum(examRoomId);
 		examRoomDao.update(examRoom);
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		//加群退群

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRoomStudentRelationMapper.xml

@@ -290,6 +290,6 @@
 		GROUP BY ersr.exam_room_id_
 	</select>
 	<select id="countSignInNum" resultType="java.lang.Integer">
-
+		SELECT COUNT(DISTINCT id_) FROM student_exam_result WHERE is_finished_exam_ = 2 AND exam_room_id_ = #{examRoomId}
 	</select>
 </mapper>