|
@@ -81,7 +81,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
|
|
|
if(Objects.isNull(examRoom.getMainTeacherUserId())){
|
|
|
throw new BizException("请指定主考老师");
|
|
|
}
|
|
|
- if(Objects.isNull(examRoom.getExamTime())){
|
|
|
+ if(Objects.isNull(examRoom.getExamStartTime())){
|
|
|
throw new BizException("请指定考试时间");
|
|
|
}
|
|
|
examRoom.setTenantId(TenantContextHolder.getTenantId().toString());
|
|
@@ -129,8 +129,8 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
|
|
|
List<ExamRoom> examRooms = examRoomDao.getWithExam(childOrganIds, examId);
|
|
|
if(!CollectionUtils.isEmpty(examRooms)){
|
|
|
examRoomStatisticsInfo.setExamRoomNum(examRooms.size());
|
|
|
- examRoomStatisticsInfo.setFirstExamTime(examRooms.stream().min(Comparator.comparing(ExamRoom::getExamTime)).get().getExamTime());
|
|
|
- examRoomStatisticsInfo.setLastExamTime(examRooms.stream().max(Comparator.comparing(ExamRoom::getExamTime)).get().getExamTime());
|
|
|
+ examRoomStatisticsInfo.setFirstExamTime(examRooms.stream().min(Comparator.comparing(ExamRoom::getExamStartTime)).get().getExamStartTime());
|
|
|
+ examRoomStatisticsInfo.setLastExamTime(examRooms.stream().max(Comparator.comparing(ExamRoom::getExamStartTime)).get().getExamStartTime());
|
|
|
int teacherNum=0;
|
|
|
for (ExamRoom examRoom : examRooms) {
|
|
|
if(Objects.nonNull(examRoom.getMainTeacherUserId())){
|