|
@@ -100,6 +100,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
|
|
|
List<ExamRoomStudentRelation> examRoomStudentRelations=new ArrayList<>();
|
|
|
List<StudentExamResult> studentExamResults=new ArrayList<>();
|
|
|
List<ExamCertification> examCertifications=new ArrayList<>();
|
|
|
+ List<ExamRegistration> updateRegistrations = new ArrayList<>();
|
|
|
for (String registId : registIds) {
|
|
|
if(existRegistIds.contains(Long.valueOf(registId))){
|
|
|
continue;
|
|
@@ -119,7 +120,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
|
|
|
|
|
|
StudentExamResult ser = new StudentExamResult();
|
|
|
ser.setExamRegistrationId(examRegistration.getId().longValue());
|
|
|
- ser.setExaminationBasicId(examRoom.getExaminationBasicId());
|
|
|
+ ser.setExaminationBasicId(examRegistration.getExaminationBasicId());
|
|
|
ser.setStudentId(examRegistration.getStudentId());
|
|
|
ser.setIsFinishedExam(0);
|
|
|
ser.setConfirmStatus(0);
|
|
@@ -140,6 +141,9 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
|
|
|
}
|
|
|
ec.setTenantId(TenantContextHolder.getTenantId());
|
|
|
examCertifications.add(ec);
|
|
|
+
|
|
|
+ examRegistration.setCardNo(ec.getCardNo());
|
|
|
+ updateRegistrations.add(examRegistration);
|
|
|
}
|
|
|
if(!CollectionUtils.isEmpty(examRoomStudentRelations)){
|
|
|
examRoomStudentRelationDao.batchInsert(examRoomStudentRelations);
|
|
@@ -153,6 +157,9 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
|
|
|
if(!CollectionUtils.isEmpty(examCertifications)){
|
|
|
examCertificationDao.batchInsert(examCertifications);
|
|
|
}
|
|
|
+ if(!CollectionUtils.isEmpty(updateRegistrations)){
|
|
|
+ examRegistrationDao.batchUpdate(updateRegistrations);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -231,7 +238,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void deleteStudentFromRoom(Long examRoomId, String studentIdsStr) {
|
|
|
+ public void deleteStudentFromRoom(Long examRoomId, String registIdsStr) {
|
|
|
if(Objects.isNull(examRoomId)){
|
|
|
throw new BizException("请指定教室");
|
|
|
}
|
|
@@ -239,11 +246,12 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
|
|
|
if(Objects.isNull(examRoom)){
|
|
|
throw new BizException("教室不存在");
|
|
|
}
|
|
|
- if(StringUtils.isBlank(studentIdsStr)){
|
|
|
+ if(StringUtils.isBlank(registIdsStr)){
|
|
|
return;
|
|
|
}
|
|
|
- List<Integer> studentIds = Arrays.asList(studentIdsStr.split(",")).stream().map(e -> Integer.valueOf(e)).collect(Collectors.toList());
|
|
|
- examRoomStudentRelationDao.deleteStudentsFromExamRoom(examRoomId, studentIds);
|
|
|
+ List<Long> registIds = Arrays.asList(registIdsStr.split(",")).stream().map(e -> Long.valueOf(e)).collect(Collectors.toList());
|
|
|
+ examRoomStudentRelationDao.deleteStudentsFromExamRoom(examRoomId, registIds);
|
|
|
+ examCertificationDao.deleteWithRegist(registIds);
|
|
|
examTeacherSalaryService.teacherSalarySettlementWithExam(examRoom.getExaminationBasicId());
|
|
|
}
|
|
|
|