|
@@ -297,9 +297,9 @@ public class ExamScoreServiceImpl implements ExamScoreService {
|
|
|
examScoreInfo.setFinalExamScore("0");
|
|
|
} else {
|
|
|
DecimalFormat decimalFormat = new DecimalFormat("#.##");
|
|
|
- examScoreInfo.setObjectiveScore(decimalFormat.format(examScore.getObjectiveScore()));
|
|
|
- examScoreInfo.setSubjectiveScore(decimalFormat.format(examScore.getSubjectiveScore()));
|
|
|
- examScoreInfo.setFinalExamScore(decimalFormat.format(examScore.getTotalScore()));
|
|
|
+ examScoreInfo.setObjectiveScore(decimalFormat.format(null == examScore.getObjectiveScore() ? 0 : examScore.getObjectiveScore()));
|
|
|
+ examScoreInfo.setSubjectiveScore(decimalFormat.format(null == examScore.getSubjectiveScore() ? 0 : examScore.getSubjectiveScore()));
|
|
|
+ examScoreInfo.setFinalExamScore(decimalFormat.format(null == examScore.getTotalScore() ? 0 : examScore.getTotalScore()));
|
|
|
}
|
|
|
}
|
|
|
|