update

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

@@ -9,7 +9,6 @@ import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.user.dto.ExamRoomListDto;
 import com.keao.edu.user.entity.Teacher;
 import com.keao.edu.user.page.ExamRoomListQueryInfo;
-import com.keao.edu.user.service.EmployeeService;
 import com.keao.edu.user.service.ExamRoomService;
 import com.keao.edu.user.service.TeacherService;
 import io.swagger.annotations.Api;
@@ -32,8 +31,6 @@ public class ExamRoomController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
     @Autowired
-    private EmployeeService employeeService;
-    @Autowired
     private TeacherService teacherService;
 
     @ApiOperation("分页查询监考列表")

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

@@ -46,6 +46,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.keao.edu.user.enums.ExamStatusEnum.RESULT_CONFIRM;
+
 @Service
 public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> implements ExamRoomService {
 
@@ -161,7 +163,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		if(Objects.isNull(examinationBasic)){
 			throw new BizException("考级项目不存在");
 		}
-		if(ExamStatusEnum.RESULT_CONFIRM.equals(examinationBasic.getStatus())){
+		if(RESULT_CONFIRM.equals(examinationBasic.getStatus())){
 			throw new BizException("考级结果已确认");
 		}
 		if(Objects.isNull(examRoom.getExamMode())){
@@ -285,7 +287,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		if(Objects.isNull(examinationBasic)){
 			throw new BizException("考级项目不存在");
 		}
-		if(ExamStatusEnum.RESULT_CONFIRM.equals(examinationBasic.getStatus())){
+		if(RESULT_CONFIRM.equals(examinationBasic.getStatus())){
 			throw new BizException("考级结果已确认");
 		}
 
@@ -791,6 +793,10 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 	@Transactional(rollbackFor = Exception.class)
 	public void changeExamRoom(Long examRoomId, Integer openFlag) {
 		ExamRoom examRoom = examRoomDao.get(examRoomId);
+		ExaminationBasic examinationBasic = examinationBasicDao.get(examRoom.getExaminationBasicId());
+		if(examinationBasic.getStatus() == RESULT_CONFIRM){
+			throw new BizException("开启失败：考试结果已确认");
+		}
 		examRoom.setId(examRoomId);
 		examRoom.setOpenFlag(openFlag);
 		if(StringUtils.isEmpty(examRoom.getAssistantTeacherUserIdList())){
@@ -808,7 +814,6 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 			String studentIds = examRoomStudentRelationService.getStudentIds(examRoomId);
 			StringBuffer stringBuffer = new StringBuffer();
 			stringBuffer.append(examRoom.getMainTeacherUserId());
-			ExaminationBasic examinationBasic = examinationBasicDao.get(examRoom.getExaminationBasicId());
 			if(StringUtils.isNotEmpty(studentIds)){
 				stringBuffer.append(",").append(studentIds);
 			}

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

@@ -41,6 +41,8 @@ import org.springframework.util.CollectionUtils;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.keao.edu.user.enums.ExamStatusEnum.RESULT_CONFIRM;
+
 @Service
 public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, ExamRoomStudentRelation> implements ExamRoomStudentRelationService {
 	
@@ -674,6 +676,10 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 	@Transactional(rollbackFor = Exception.class)
 	public synchronized void signIn(Long examRegistrationId) {
 		ExamRoomStudentRelation studentExamRoom = examRoomStudentRelationDao.getStudentExamRoom(examRegistrationId);
+		ExaminationBasic examinationBasic = examinationBasicDao.get(studentExamRoom.getExaminationBasicId());
+		if(examinationBasic.getStatus() == RESULT_CONFIRM){
+			throw new BizException("开启失败：考试结果已确认");
+		}
 		if(studentExamRoom.getSignInTime() != null){
 			throw new BizException("您已签到,请勿重复操作!");
 		}

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamRoomMapper.xml

@@ -324,7 +324,7 @@
 	</resultMap>
 	<sql id="queryExamRoomPageListSql">
 		<where>
-			er.exam_plan_push_flag_ = 1 AND (er.main_teacher_user_id_ = #{teacherId} OR FIND_IN_SET(#{teacherId},er.assistant_teacher_user_id_list_))
+			eb.status_ != 'RESULT_CONFIRM' AND er.exam_plan_push_flag_ = 1 AND (er.main_teacher_user_id_ = #{teacherId} OR FIND_IN_SET(#{teacherId},er.assistant_teacher_user_id_list_))
 			<if test="startTime != null and startTime != ''">
 				AND DATE_FORMAT(er.exam_end_time_,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
 			</if>