|
@@ -85,8 +85,8 @@ public class ExamStudentFinalScoreServiceImpl implements ExamStudentFinalScoreSe
|
|
|
return this.calcAndSaveFinalScore(examStudentId);
|
|
|
}
|
|
|
|
|
|
- private ExamStudentFinalScoreEntity saveExamStudentFinalScore(Long examStudentId,
|
|
|
- ExamScoreEntity finalEffectiveExamScore) {
|
|
|
+ private ExamStudentFinalScoreEntity saveExamStudentFinalScore(
|
|
|
+ Long examStudentId, ExamScoreEntity finalEffectiveExamScore) {
|
|
|
if (finalEffectiveExamScore == null) {
|
|
|
return null;
|
|
|
}
|
|
@@ -104,7 +104,7 @@ public class ExamStudentFinalScoreServiceImpl implements ExamStudentFinalScoreSe
|
|
|
finalScoreEntity.setSuccPercent(finalEffectiveExamScore.getSuccPercent());
|
|
|
finalScoreEntity.setTotalScore(finalEffectiveExamScore.getTotalScore());
|
|
|
|
|
|
- LOG.warn("【最终成绩】已更新! examStudentId:{} examRecordDataId:{} objectiveScore:{} subjectiveScore:{}",
|
|
|
+ LOG.warn("【最终成绩】已更新! examStudentId:{} finalExamRecordDataId:{} objectiveScore:{} subjectiveScore:{}",
|
|
|
examStudentId, finalScoreEntity.getExamRecordDataId(), finalScoreEntity.getObjectiveScore(),
|
|
|
finalScoreEntity.getSubjectiveScore());
|
|
|
return examStudentFinalScoreRepo.save(finalScoreEntity);
|
|
@@ -114,7 +114,7 @@ public class ExamStudentFinalScoreServiceImpl implements ExamStudentFinalScoreSe
|
|
|
* 计算得出最终有效成绩
|
|
|
*/
|
|
|
private ExamScoreEntity getFinalEffectiveExamScore(List<ExamRecordDataEntity> examRecords, String examType,
|
|
|
- String markingType) {
|
|
|
+ String markingType) {
|
|
|
if (examRecords == null || examRecords.isEmpty()) {
|
|
|
return null;
|
|
|
}
|