|
@@ -109,10 +109,10 @@ public class TEExamController {
|
|
|
teExamDto.setCreateId(tbUser.getId());
|
|
|
}
|
|
|
teExam = new TEExam(teExamDto);
|
|
|
- if(oldTeExam!=null) {
|
|
|
- teExam.setMonitorStatus(oldTeExam.getMonitorStatus());
|
|
|
- }else {
|
|
|
- teExam.setMonitorStatus(InvigilateMonitorStatusEnum.NOT_START);
|
|
|
+ if (oldTeExam != null) {
|
|
|
+ teExam.setMonitorStatus(oldTeExam.getMonitorStatus());
|
|
|
+ } else {
|
|
|
+ teExam.setMonitorStatus(InvigilateMonitorStatusEnum.NOT_START);
|
|
|
}
|
|
|
teExamService.saveOrUpdate(teExam);
|
|
|
teExamService.updateExamCacheBean(teExam.getId());
|
|
@@ -375,7 +375,8 @@ public class TEExamController {
|
|
|
if (Objects.nonNull(roomCodeSet) && roomCodeSet.size() > 0) {
|
|
|
//根据roomCode获取当前老师所要监考的全部应考学生数
|
|
|
QueryWrapper<TEExamStudent> teExamStudentQueryWrapper = new QueryWrapper<>();
|
|
|
- teExamStudentQueryWrapper.lambda().in(TEExamStudent::getRoomCode, roomCodeSet);
|
|
|
+ teExamStudentQueryWrapper.lambda().eq(TEExamStudent::getExamId, examId)
|
|
|
+ .in(TEExamStudent::getRoomCode, roomCodeSet);
|
|
|
List<TEExamStudent> teExamStudentList = teExamStudentService.list(teExamStudentQueryWrapper);
|
|
|
Set<String> studentSet = null;
|
|
|
Set<Long> examActivityIdSet = null;
|