|
@@ -252,6 +252,18 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamS
|
|
Map<String, String> courseMap = new HashMap<>();
|
|
Map<String, String> courseMap = new HashMap<>();
|
|
Map<String, List<String>> studentCodeMap = new HashMap<>();
|
|
Map<String, List<String>> studentCodeMap = new HashMap<>();
|
|
for (ExamStudent basicStudent : basicStudentList) {
|
|
for (ExamStudent basicStudent : basicStudentList) {
|
|
|
|
+ // 学号去掉空格
|
|
|
|
+ basicStudent.setStudentCode(StringUtils.isNotBlank(basicStudent.getStudentCode()) ? StringUtils.deleteWhitespace(basicStudent.getStudentCode()) : null);
|
|
|
|
+ // 课程代码去掉空格
|
|
|
|
+ basicStudent.setCourseCode(StringUtils.isNotBlank(basicStudent.getCourseCode()) ? StringUtils.deleteWhitespace(basicStudent.getCourseCode()) : null);
|
|
|
|
+ // 课程名称去掉空格
|
|
|
|
+ basicStudent.setCourseName(StringUtils.isNotBlank(basicStudent.getCourseName()) ? StringUtils.deleteWhitespace(basicStudent.getCourseName()) : null);
|
|
|
|
+ // 考场去掉空格
|
|
|
|
+ basicStudent.setExamRoom(StringUtils.isNotBlank(basicStudent.getExamRoom()) ? StringUtils.deleteWhitespace(basicStudent.getExamRoom()) : null);
|
|
|
|
+ // 班级去掉空格
|
|
|
|
+ basicStudent.setClassName(StringUtils.isNotBlank(basicStudent.getClassName()) ? StringUtils.deleteWhitespace(basicStudent.getClassName()) : null);
|
|
|
|
+
|
|
|
|
+
|
|
StringJoiner errorMsg = new StringJoiner(";");
|
|
StringJoiner errorMsg = new StringJoiner(";");
|
|
if (StringUtils.isBlank(basicStudent.getStudentCode())) {
|
|
if (StringUtils.isBlank(basicStudent.getStudentCode())) {
|
|
errorMsg.add("学号必填");
|
|
errorMsg.add("学号必填");
|
|
@@ -295,17 +307,6 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamS
|
|
throw ExceptionResultEnum.ERROR.exception(errorMsg.toString());
|
|
throw ExceptionResultEnum.ERROR.exception(errorMsg.toString());
|
|
}
|
|
}
|
|
|
|
|
|
- // 学号去掉空格
|
|
|
|
- basicStudent.setStudentCode(StringUtils.isNotBlank(basicStudent.getStudentCode()) ? StringUtils.deleteWhitespace(basicStudent.getStudentCode()) : null);
|
|
|
|
- // 课程代码去掉空格
|
|
|
|
- basicStudent.setCourseCode(StringUtils.isNotBlank(basicStudent.getCourseCode()) ? StringUtils.deleteWhitespace(basicStudent.getCourseCode()) : null);
|
|
|
|
- // 课程名称去掉空格
|
|
|
|
- basicStudent.setCourseName(StringUtils.isNotBlank(basicStudent.getCourseName()) ? StringUtils.deleteWhitespace(basicStudent.getCourseName()) : null);
|
|
|
|
- // 考场去掉空格
|
|
|
|
- basicStudent.setExamRoom(StringUtils.isNotBlank(basicStudent.getExamRoom()) ? StringUtils.deleteWhitespace(basicStudent.getExamRoom()) : null);
|
|
|
|
- // 班级去掉空格
|
|
|
|
- basicStudent.setClassName(StringUtils.isNotBlank(basicStudent.getClassName()) ? StringUtils.deleteWhitespace(basicStudent.getClassName()) : null);
|
|
|
|
-
|
|
|
|
basicStudent.setId(SystemConstant.getDbUuid());
|
|
basicStudent.setId(SystemConstant.getDbUuid());
|
|
basicStudent.setSchoolId(sysUser.getSchoolId());
|
|
basicStudent.setSchoolId(sysUser.getSchoolId());
|
|
basicStudent.setSemesterId(semesterId);
|
|
basicStudent.setSemesterId(semesterId);
|