diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java index 5e28c9d..197cd98 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java +++ b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java @@ -347,8 +347,8 @@ public class TeaGradeManageServiceImpl implements ITeaGradeManageService { //计算模块得分 private BigDecimal getModuleScore(StuTrainingWithBLOBs stuTrainingWithBLOB, SysWeight sysWeight) { -// BigDecimal knowledgeSummaryWeight = sysWeight.getKnowledgeSummaryWeight(); -// BigDecimal resourceLearningWeight = sysWeight.getResourceLearningWeight(); + BigDecimal knowledgeSummaryWeight = sysWeight.getKnowledgeSummaryWeight(); + BigDecimal resourceLearningWeight = sysWeight.getResourceLearningWeight(); BigDecimal learningEvalWeight = sysWeight.getLearningEvalWeight(); BigDecimal expTrainingWeight = sysWeight.getExpTrainingWeight(); @@ -358,8 +358,8 @@ public class TeaGradeManageServiceImpl implements ITeaGradeManageService { BigDecimal learningEvalScore = Optional.ofNullable(stuTrainingWithBLOB.getLearningEvalScore()).orElse(BigDecimal.ZERO); BigDecimal expTrainingScore = Optional.ofNullable(stuTrainingWithBLOB.getExpTrainingScore()).orElse(BigDecimal.ZERO); -// knowledgeSummaryScore = knowledgeSummaryWeight.multiply(knowledgeSummaryScore) -// resourceLearningScore = resourceLearningScore.multiply(resourceLearningWeight); + knowledgeSummaryScore = knowledgeSummaryWeight.multiply(knowledgeSummaryScore); + resourceLearningScore = resourceLearningScore.multiply(resourceLearningWeight); learningEvalScore = learningEvalScore.multiply(learningEvalWeight).divide(BigDecimal.valueOf(100).setScale(2,RoundingMode.HALF_UP)); expTrainingScore = expTrainingScore.multiply(expTrainingWeight).divide(BigDecimal.valueOf(100).setScale(2,RoundingMode.HALF_UP));