Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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

@@ -27,6 +27,7 @@ import com.keao.edu.user.dto.NeedCheckingDetailDto;
 import com.keao.edu.user.dto.RoomStudentListDto;
 import com.keao.edu.user.dto.StuRecordDetailDto;
 import com.keao.edu.user.entity.*;
+import com.keao.edu.user.enums.ExamStatusEnum;
 import com.keao.edu.user.page.ExamRoomStudentRelationQueryInfo;
 import com.keao.edu.user.service.*;
 import com.keao.edu.util.collection.MapUtil;
@@ -104,6 +105,13 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 		if(Objects.isNull(examRoom)){
 			throw new BizException("教室不存在");
 		}
+		ExaminationBasic examinationBasic = examinationBasicDao.get(examRoom.getExaminationBasicId().longValue());
+		if(Objects.isNull(examinationBasic)){
+			throw new BizException("考级项目不存在");
+		}
+		if(ExamStatusEnum.RESULT_CONFIRM.equals(examinationBasic.getStatus())){
+			throw new BizException("考级结果已确认");
+		}
 		Date now=new Date();
 		if(now.compareTo(examRoom.getExamStartTime())>0||DateUtil.isSameDay(now, examRoom.getExamStartTime())){
 			throw new BizException("无法添加学员");
@@ -256,6 +264,13 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 		if(Objects.isNull(examRegistration)){
 			throw new BizException("学员报名信息不存在");
 		}
+		ExaminationBasic examinationBasic = examinationBasicDao.get(examRegistration.getExaminationBasicId().longValue());
+		if(Objects.isNull(examinationBasic)){
+			throw new BizException("考级项目不存在");
+		}
+		if(ExamStatusEnum.RESULT_CONFIRM.equals(examinationBasic.getStatus())){
+			throw new BizException("考级结果已确认");
+		}
 		ExamRoom examRoom = examRoomDao.get(examRoomId);
 		if(Objects.isNull(examRoom)){
 			throw new BizException("考场信息不存在");