|
@@ -443,7 +443,7 @@ public class SubjectServiceImpl extends MppServiceImpl<SubjectDao, SubjectEntity
|
|
fields[6].setLength(4);
|
|
fields[6].setLength(4);
|
|
|
|
|
|
fields[7] = new DBFField();
|
|
fields[7] = new DBFField();
|
|
- fields[7].setName("Wi");
|
|
|
|
|
|
+ fields[7].setName("Wj");
|
|
fields[7].setType(DBFDataType.NUMERIC);
|
|
fields[7].setType(DBFDataType.NUMERIC);
|
|
fields[7].setLength(2);
|
|
fields[7].setLength(2);
|
|
|
|
|
|
@@ -730,12 +730,12 @@ public class SubjectServiceImpl extends MppServiceImpl<SubjectDao, SubjectEntity
|
|
QueryWrapper<SubjectEntity> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<SubjectEntity> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.lambda().eq(SubjectEntity::getExamId, examId);
|
|
queryWrapper.lambda().eq(SubjectEntity::getExamId, examId);
|
|
queryWrapper.lambda().eq(SubjectEntity::getName, subjectName);
|
|
queryWrapper.lambda().eq(SubjectEntity::getName, subjectName);
|
|
- SubjectEntity subject = this.getOne(queryWrapper);
|
|
|
|
|
|
+ SubjectEntity subject = this.getOne(queryWrapper);
|
|
if (subject != null) {
|
|
if (subject != null) {
|
|
throw new ParameterException("科目代码在本考试中已存在");
|
|
throw new ParameterException("科目代码在本考试中已存在");
|
|
}
|
|
}
|
|
- subject = this.findByExamIdAndCode(examId,subjectCode);
|
|
|
|
- if(subject == null){
|
|
|
|
|
|
+ subject = this.findByExamIdAndCode(examId, subjectCode);
|
|
|
|
+ if (subject == null) {
|
|
throw new ParameterException("subject不存在");
|
|
throw new ParameterException("subject不存在");
|
|
}
|
|
}
|
|
subject.setName(subjectName);
|
|
subject.setName(subjectName);
|