|
@@ -1745,16 +1745,12 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
|
|
|
StringBuilder msg = new StringBuilder();
|
|
|
String[] str = line.split(",");
|
|
|
- if (str.length != 3) {
|
|
|
+ if (str.length != 2) {
|
|
|
msg.append(" 无法解析,请检查分隔符和数据");
|
|
|
throw new ParameterException(newError(i + 1, msg.toString()));
|
|
|
}
|
|
|
String examNumber = str[0];
|
|
|
String absent = str[1];
|
|
|
- String subjectCode = str[2];
|
|
|
- if (StringUtils.isBlank(subjectCode) || !vo.getSubjectCode().equals(subjectCode)) {
|
|
|
- msg.append(" 科目代码不正确");
|
|
|
- }
|
|
|
if (StringUtils.isBlank(examNumber)) {
|
|
|
examNumber = null;
|
|
|
msg.append(" 准考证号不能为空");
|
|
@@ -1771,8 +1767,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
if (examNumbers.containsKey(examNumber)) {
|
|
|
msg.append(" 准考证号有重复");
|
|
|
} else {
|
|
|
- StudentEntity student = this.findByExamAndSubjectCodeAndExamNumber(vo.getExamId(), subjectCode,
|
|
|
- examNumber);
|
|
|
+ StudentEntity student = this.findByExamAndSubjectCodeAndExamNumber(vo.getExamId(),
|
|
|
+ vo.getSubjectCode(), examNumber);
|
|
|
if (student == null) {
|
|
|
msg.append(" 准考证号不存在");
|
|
|
} else {
|
|
@@ -2342,14 +2338,10 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
}
|
|
|
StringBuilder msg = new StringBuilder();
|
|
|
String[] line = lineString.split(",");
|
|
|
- if (line.length != 4) {
|
|
|
+ if (line.length != 3) {
|
|
|
msg.append(" 格式错误");
|
|
|
} else {
|
|
|
- String subjectCode = trimAndNullIfBlank(line[0]);
|
|
|
- if (StringUtils.isBlank(subjectCode)) {
|
|
|
- throw new ParameterException(errorMsg(i + 1, " 科目代码不能为空"));
|
|
|
- }
|
|
|
- String examNumber = trimAndNullIfBlank(line[1]);
|
|
|
+ String examNumber = trimAndNullIfBlank(line[0]);
|
|
|
if (StringUtils.isBlank(examNumber)) {
|
|
|
msg.append(" 准考证号不能为空");
|
|
|
} else {
|
|
@@ -2366,7 +2358,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- String breach = trimAndNullIfBlank(line[3]);
|
|
|
+ String breach = trimAndNullIfBlank(line[2]);
|
|
|
if (StringUtils.isBlank(breach)) {
|
|
|
msg.append(" 违纪不能为空");
|
|
|
} else {
|
|
@@ -2499,14 +2491,10 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
}
|
|
|
StringBuilder msg = new StringBuilder();
|
|
|
String[] line = lineString.split(",");
|
|
|
- if (line.length != 4) {
|
|
|
+ if (line.length != 3) {
|
|
|
msg.append(" 格式错误");
|
|
|
} else {
|
|
|
- String subjectCode = trimAndNullIfBlank(line[0]);
|
|
|
- if (StringUtils.isBlank(subjectCode)) {
|
|
|
- throw new ParameterException(errorMsg(i + 1, " 科目代码不能为空"));
|
|
|
- }
|
|
|
- String examNumber = trimAndNullIfBlank(line[1]);
|
|
|
+ String examNumber = trimAndNullIfBlank(line[0]);
|
|
|
if (StringUtils.isBlank(examNumber)) {
|
|
|
msg.append(" 准考证号不能为空");
|
|
|
} else {
|
|
@@ -2523,7 +2511,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- String breach = trimAndNullIfBlank(line[3]);
|
|
|
+ String breach = trimAndNullIfBlank(line[2]);
|
|
|
if (StringUtils.isBlank(breach)) {
|
|
|
msg.append(" 考生状态不能为空");
|
|
|
} else {
|