Эх сурвалжийг харах

学生导入去掉空格bugfix

wangliang 3 жил өмнө
parent
commit
afed8aff6f

+ 3 - 3
themis-business/src/main/java/com/qmth/themis/business/templete/service/impl/TempleteLogicServiceImpl.java

@@ -141,19 +141,19 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
                     }
                     }
                     //先根据证件号+科目代码查询考生是否存在,存在则更新,不存在则插入
                     //先根据证件号+科目代码查询考生是否存在,存在则更新,不存在则插入
                     QueryWrapper<TEExamStudent> teExamStudentQueryWrapper = new QueryWrapper<>();
                     QueryWrapper<TEExamStudent> teExamStudentQueryWrapper = new QueryWrapper<>();
-                    teExamStudentQueryWrapper.lambda().eq(TEExamStudent::getIdentity, examStudentImportDto.getIdentity())
+                    teExamStudentQueryWrapper.lambda().eq(TEExamStudent::getIdentity, examStudentImportDto.getIdentity().trim())
                             .eq(TEExamStudent::getCourseCode, examStudentImportDto.getCourseCode())
                             .eq(TEExamStudent::getCourseCode, examStudentImportDto.getCourseCode())
                             .eq(TEExamStudent::getExamId, examId)
                             .eq(TEExamStudent::getExamId, examId)
                             .eq(TEExamStudent::getExamActivityId, teExamActivity.getId());
                             .eq(TEExamStudent::getExamActivityId, teExamActivity.getId());
                     TEExamStudent teExamStudent = teExamStudentService.getOne(teExamStudentQueryWrapper);
                     TEExamStudent teExamStudent = teExamStudentService.getOne(teExamStudentQueryWrapper);
                     //如果为空则插入考生数据,插入考生前先插入学生档案数据
                     //如果为空则插入考生数据,插入考生前先插入学生档案数据
                     QueryWrapper<TEStudent> teStudentQueryWrapper = new QueryWrapper<>();
                     QueryWrapper<TEStudent> teStudentQueryWrapper = new QueryWrapper<>();
-                    teStudentQueryWrapper.lambda().eq(TEStudent::getIdentity, examStudentImportDto.getIdentity()).eq(TEStudent::getOrgId, orgId);
+                    teStudentQueryWrapper.lambda().eq(TEStudent::getIdentity, examStudentImportDto.getIdentity().trim()).eq(TEStudent::getOrgId, orgId);
                     TEStudent teStudent = teStudentService.getOne(teStudentQueryWrapper);
                     TEStudent teStudent = teStudentService.getOne(teStudentQueryWrapper);
                     if (Objects.isNull(teExamStudent)) {
                     if (Objects.isNull(teExamStudent)) {
                         if (Objects.isNull(teStudent)) {//如果学生数据为空则插入学生数据
                         if (Objects.isNull(teStudent)) {//如果学生数据为空则插入学生数据
                             //先插入学生档案数据
                             //先插入学生档案数据
-                            teStudent = new TEStudent(orgId, examStudentImportDto.getIdentity(), examStudentImportDto.getName(), createId);
+                            teStudent = new TEStudent(orgId, examStudentImportDto.getIdentity().trim(), examStudentImportDto.getName(), createId);
                         }
                         }
                         teExamStudent = gson.fromJson(gson.toJson(examStudentImportDto), TEExamStudent.class);
                         teExamStudent = gson.fromJson(gson.toJson(examStudentImportDto), TEExamStudent.class);
                         teExamStudent.setExamId(examId);
                         teExamStudent.setExamId(examId);