|
@@ -25,10 +25,7 @@ import com.keao.edu.user.dto.ExamRoomDto;
|
|
import com.keao.edu.user.dto.ExamRoomExamTimeDto;
|
|
import com.keao.edu.user.dto.ExamRoomExamTimeDto;
|
|
import com.keao.edu.user.dto.ExamRoomListDto;
|
|
import com.keao.edu.user.dto.ExamRoomListDto;
|
|
import com.keao.edu.user.dto.ExamRoomStatisticsDto;
|
|
import com.keao.edu.user.dto.ExamRoomStatisticsDto;
|
|
-import com.keao.edu.user.entity.ExamLifecycleLog;
|
|
|
|
-import com.keao.edu.user.entity.ExamOrganizationRelation;
|
|
|
|
-import com.keao.edu.user.entity.ExamRegistration;
|
|
|
|
-import com.keao.edu.user.entity.ExaminationBasic;
|
|
|
|
|
|
+import com.keao.edu.user.entity.*;
|
|
import com.keao.edu.user.page.ExamRoomListQueryInfo;
|
|
import com.keao.edu.user.page.ExamRoomListQueryInfo;
|
|
import com.keao.edu.user.page.ExamRoomQueryInfo;
|
|
import com.keao.edu.user.page.ExamRoomQueryInfo;
|
|
import com.keao.edu.user.service.*;
|
|
import com.keao.edu.user.service.*;
|
|
@@ -82,6 +79,10 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
|
|
private ExamRoomStudentRelationDao examRoomStudentRelationDao;
|
|
private ExamRoomStudentRelationDao examRoomStudentRelationDao;
|
|
@Autowired
|
|
@Autowired
|
|
private SysConfigService sysConfigService;
|
|
private SysConfigService sysConfigService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ExamCertificationDao examCertificationDao;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ExamLocationDao examLocationDao;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public BaseDAO<Long, ExamRoom> getDAO() {
|
|
public BaseDAO<Long, ExamRoom> getDAO() {
|
|
@@ -338,6 +339,16 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
|
|
}
|
|
}
|
|
examinationBasicDao.update(examinationBasic);
|
|
examinationBasicDao.update(examinationBasic);
|
|
|
|
|
|
|
|
+ if(ExamModeEnum.OFFLINE.equals(examRoom.getExamMode())){
|
|
|
|
+ ExamLocation examLocation = examLocationDao.get(examRoom.getExamLocationId());
|
|
|
|
+ if(Objects.isNull(examLocation)){
|
|
|
|
+ throw new BizException("考试地址不存在");
|
|
|
|
+ }
|
|
|
|
+ List<ExamRoomStudentRelation> examRoomStudents = examRoomStudentRelationDao.findStudentsWithExamRoom(examRoom.getId());
|
|
|
|
+ List<Long> registIds = examRoomStudents.stream().map(ExamRoomStudentRelation::getExamRegistrationId).collect(Collectors.toList());
|
|
|
|
+ examCertificationDao.updateExamAddress(examLocation.getAddress(), registIds);
|
|
|
|
+ }
|
|
|
|
+
|
|
examTeacherSalaryService.teacherSalarySettlementWithExam(examRoom.getExaminationBasicId());
|
|
examTeacherSalaryService.teacherSalarySettlementWithExam(examRoom.getExaminationBasicId());
|
|
return examRoom;
|
|
return examRoom;
|
|
}
|
|
}
|