|
@@ -117,10 +117,6 @@ public class ExamStudentFinalScoreServiceImpl implements ExamStudentFinalScoreSe
|
|
|
throw new StatusException("examType is null");
|
|
|
}
|
|
|
|
|
|
- if (markingType == null) {
|
|
|
- throw new StatusException("markingType is null");
|
|
|
- }
|
|
|
-
|
|
|
//取出有效记录的id
|
|
|
List<Long> examRecordDataIds = examRecords.stream().map(ExamRecordDataEntity::getId).collect(Collectors.toList());
|
|
|
|
|
@@ -135,6 +131,10 @@ public class ExamStudentFinalScoreServiceImpl implements ExamStudentFinalScoreSe
|
|
|
return examScoreList.get(0);
|
|
|
}
|
|
|
|
|
|
+ if (markingType == null) {
|
|
|
+ throw new StatusException("markingType is null");
|
|
|
+ }
|
|
|
+
|
|
|
if (markingType.equals(MarkingType.ALL.name()) || markingType.equals(MarkingType.OBJECT_SCORE_MAX.name())) {
|
|
|
//全部评阅规则或客观分最高规则:取总分最高
|
|
|
List<ExamScoreEntity> examScores = examScoreList.stream()
|