Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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

@@ -453,6 +453,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		List<ExamRoom> needUpdateExamRooms = new ArrayList<>();
 		List<ExamRegistration> updateRegistrations = new ArrayList<>();
 		List<ExamCertification> examCertifications=new ArrayList<>();
+		List<StudentExamResult> studentExamResults=new ArrayList<>();
 
 		String baseUrl = "2?examRegistrationId=";
 
@@ -485,6 +486,16 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 				ec.setTenantId(TenantContextHolder.getTenantId());
 				examCertifications.add(ec);
 
+				StudentExamResult ser = new StudentExamResult();
+				ser.setExamRegistrationId(examRegistration.getId().longValue());
+				ser.setExaminationBasicId(examRegistration.getExaminationBasicId());
+				ser.setStudentId(examRegistration.getStudentId());
+				ser.setIsFinishedExam(3);
+				ser.setConfirmStatus(0);
+				ser.setTenantId(TenantContextHolder.getTenantId());
+				ser.setExamRoomId(student.getExamRoomId());
+				studentExamResults.add(ser);
+
 				examRegistration.setCardNo(ec.getCardNo());
 				updateRegistrations.add(examRegistration);
 			}
@@ -555,6 +566,9 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		if(!CollectionUtils.isEmpty(updateRegistrations)){
 			examRegistrationDao.batchUpdate(updateRegistrations);
 		}
+		if(!CollectionUtils.isEmpty(studentExamResults)){
+			studentExamResultDao.batchInsert(studentExamResults);
+		}
 	}
 
 	@Override

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

@@ -123,7 +123,6 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 		}
 
 		List<ExamRoomStudentRelation> examRoomStudentRelations=new ArrayList<>();
-		List<StudentExamResult> studentExamResults=new ArrayList<>();
 		for (String registId : registIds) {
 			if(existRegistIds.contains(Long.valueOf(registId))){
 				continue;
@@ -143,16 +142,6 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 			e.setStudentId(examRegistration.getStudentId());
 			e.setTenantId(TenantContextHolder.getTenantId());
 			examRoomStudentRelations.add(e);
-
-			StudentExamResult ser = new StudentExamResult();
-			ser.setExamRegistrationId(examRegistration.getId().longValue());
-			ser.setExaminationBasicId(examRegistration.getExaminationBasicId());
-			ser.setStudentId(examRegistration.getStudentId());
-			ser.setIsFinishedExam(3);
-			ser.setConfirmStatus(0);
-			ser.setTenantId(TenantContextHolder.getTenantId());
-			ser.setExamRoomId(examRoomId);
-			studentExamResults.add(ser);
 		}
 		if(!CollectionUtils.isEmpty(examRoomStudentRelations)){
 			examRoomStudentRelationDao.batchInsert(examRoomStudentRelations);
@@ -160,9 +149,6 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 			examRoom.setExamRoomStudentNum(examRoomStudentRelationDao.countStudentsWithRoom(examRoom.getId()));
 			examRoomDao.update(examRoom);
 		}
-		if(!CollectionUtils.isEmpty(studentExamResults)){
-			studentExamResultDao.batchInsert(studentExamResults);
-		}
 	}
 
 	@Override
@@ -213,13 +199,6 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 		studentExamRoom.setExamRoomId(examRoomId);
 		examRoomStudentRelationDao.update(studentExamRoom);
 
-		StudentExamResult studentExamResult = studentExamResultDao.findByRegistrationId(registId);
-		if(Objects.isNull(studentExamResult)){
-			throw new BizException("学员信息错误");
-		}
-		studentExamResult.setExamRoomId(examRoomId);
-		studentExamResultDao.update(studentExamResult);
-
 		examRoom.setExamRoomStudentNum(examRoomStudentRelationDao.countStudentsWithRoom(examRoom.getId()));
 		examRoomDao.update(examRoom);
 	}
@@ -290,9 +269,6 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 		if(StringUtils.isBlank(registIdsStr)){
 			return;
 		}
-		List<Long> registIds = Arrays.asList(registIdsStr.split(",")).stream().map(e -> Long.valueOf(e)).collect(Collectors.toList());
-		examRoomStudentRelationDao.deleteStudentsFromExamRoom(examRoomId, registIds);
-		studentExamResultDao.deleteWithRegists(registIds);
 		examRoom.setExamRoomStudentNum(examRoomStudentRelationDao.countStudentsWithRoom(examRoom.getId()));
 		examRoomDao.update(examRoom);
 		examTeacherSalaryService.teacherSalarySettlementWithExam(examRoom.getExaminationBasicId());