|
@@ -222,40 +222,14 @@ public class TEExamStudentController {
|
|
s.setStudentId(teStudent.getId());
|
|
s.setStudentId(teStudent.getId());
|
|
s.setCreateId(tbUser.getId());
|
|
s.setCreateId(tbUser.getId());
|
|
}
|
|
}
|
|
- }else {
|
|
|
|
|
|
+ } else {
|
|
UpdateWrapper<TEStudent> teStudentUpdateWrapper = new UpdateWrapper<>();
|
|
UpdateWrapper<TEStudent> teStudentUpdateWrapper = new UpdateWrapper<>();
|
|
teStudentUpdateWrapper.lambda().set(TEStudent::getName, s.getName())
|
|
teStudentUpdateWrapper.lambda().set(TEStudent::getName, s.getName())
|
|
- .eq(TEStudent::getIdentity, s.getIdentity());
|
|
|
|
|
|
+ .eq(TEStudent::getIdentity, s.getIdentity())
|
|
|
|
+ .eq(TEStudent::getOrgId, tbOrg.getId());
|
|
teStudentService.update(teStudentUpdateWrapper);
|
|
teStudentService.update(teStudentUpdateWrapper);
|
|
s.setUpdateId(tbUser.getId());
|
|
s.setUpdateId(tbUser.getId());
|
|
}
|
|
}
|
|
-
|
|
|
|
-// if (Objects.isNull(s.getId())) {
|
|
|
|
-// QueryWrapper<TEStudent> teExamStudentQueryWrapper = new QueryWrapper<>();
|
|
|
|
-// teExamStudentQueryWrapper.lambda().eq(TEStudent::getName, s.getName())
|
|
|
|
-// .eq(TEStudent::getIdentity, s.getIdentity()).eq(TEStudent::getOrgId, tbOrg.getId());
|
|
|
|
-// TEStudent student = teStudentService.getOne(teExamStudentQueryWrapper);
|
|
|
|
-// if (student == null) {
|
|
|
|
-// TEStudent teStudent = new TEStudent(tbOrg.getId(), s.getIdentity(), s.getName(), tbUser.getId());
|
|
|
|
-// teStudentService.save(teStudent);
|
|
|
|
-// s.setStudentId(teStudent.getId());
|
|
|
|
-// s.setCreateId(tbUser.getId());
|
|
|
|
-// } else {
|
|
|
|
-// s.setStudentId(student.getId());
|
|
|
|
-// s.setCreateId(tbUser.getId());
|
|
|
|
-// }
|
|
|
|
-// } else {
|
|
|
|
-// UpdateWrapper<TEExamStudent> teExamStudentUpdateWrapper = new UpdateWrapper<>();
|
|
|
|
-// teExamStudentUpdateWrapper.lambda().set(TEExamStudent::getName, s.getName())
|
|
|
|
-// .eq(TEExamStudent::getIdentity, s.getIdentity());
|
|
|
|
-// teExamStudentService.update(teExamStudentUpdateWrapper);
|
|
|
|
-//
|
|
|
|
-// UpdateWrapper<TEStudent> teStudentUpdateWrapper = new UpdateWrapper<>();
|
|
|
|
-// teStudentUpdateWrapper.lambda().set(TEStudent::getName, s.getName())
|
|
|
|
-// .eq(TEStudent::getIdentity, s.getIdentity());
|
|
|
|
-// teStudentService.update(teStudentUpdateWrapper);
|
|
|
|
-// s.setUpdateId(tbUser.getId());
|
|
|
|
-// }
|
|
|
|
ExamCourseCacheBean examCourseCacheBean = teExamCourseService
|
|
ExamCourseCacheBean examCourseCacheBean = teExamCourseService
|
|
.getExamCourseCacheBean(s.getExamId(), s.getCourseCode());
|
|
.getExamCourseCacheBean(s.getExamId(), s.getCourseCode());
|
|
if (Objects.isNull(examCourseCacheBean)) {
|
|
if (Objects.isNull(examCourseCacheBean)) {
|