|
@@ -110,6 +110,10 @@ public class TCFinalScoreServiceImpl extends ServiceImpl<TCFinalScoreMapper, TCF
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ BasicCourse basicCourse = basicCourseService.getById(courseId);
|
|
|
|
+ if (Objects.isNull(basicCourse)) {
|
|
|
|
+ throw ExceptionResultEnum.ERROR.exception("课程不存在");
|
|
|
|
+ }
|
|
for (int i = 0; i < arrayList.size(); i++) {
|
|
for (int i = 0; i < arrayList.size(); i++) {
|
|
String[] strs = arrayList.get(i);
|
|
String[] strs = arrayList.get(i);
|
|
if (Objects.nonNull(strs) && strs.length > 0) {
|
|
if (Objects.nonNull(strs) && strs.length > 0) {
|
|
@@ -118,7 +122,7 @@ public class TCFinalScoreServiceImpl extends ServiceImpl<TCFinalScoreMapper, TCF
|
|
}
|
|
}
|
|
boolean error = false;
|
|
boolean error = false;
|
|
List<TCFinalScoreDto> tcFinalScoreDtoList = new ArrayList<>();
|
|
List<TCFinalScoreDto> tcFinalScoreDtoList = new ArrayList<>();
|
|
- TCFinalScore tcFinalScore = new TCFinalScore(cultureProgramId, courseId, null, markPaper.getCourseName(), paperNumber, SourceEnum.EXCEL_IMPORT, sysUser.getId());
|
|
|
|
|
|
+ TCFinalScore tcFinalScore = new TCFinalScore(cultureProgramId, courseId, basicCourse.getCode(), basicCourse.getName(), paperNumber, SourceEnum.EXCEL_IMPORT, sysUser.getId());
|
|
BigDecimal score = new BigDecimal(0);
|
|
BigDecimal score = new BigDecimal(0);
|
|
for (int j = 0; j < strs.length; j++) {
|
|
for (int j = 0; j < strs.length; j++) {
|
|
if (Objects.isNull(strs[j]) || Objects.equals(strs[j].trim(), "")) {
|
|
if (Objects.isNull(strs[j]) || Objects.equals(strs[j].trim(), "")) {
|