diff --git a/src/main/java/com/sztzjy/marketing/entity/StuUser.java b/src/main/java/com/sztzjy/marketing/entity/StuUser.java index 4e93f35..e25ae84 100644 --- a/src/main/java/com/sztzjy/marketing/entity/StuUser.java +++ b/src/main/java/com/sztzjy/marketing/entity/StuUser.java @@ -1,8 +1,8 @@ package com.sztzjy.marketing.entity; -import java.math.BigDecimal; - import io.swagger.annotations.ApiModelProperty; + +import java.math.BigDecimal; /** * * @author whb @@ -198,13 +198,13 @@ public class StuUser { public StuUser(StuUser stuUser, TchModuleWeith resultsOverviewWeight) { this.userId=stuUser.getUserId(); - //知识概要成绩 + BigDecimal summaryKnowledgeScore =stuUser.getSummaryKnowledgeScore().multiply(resultsOverviewWeight.getSummaryOfKnowledgeWeight()).setScale(2,BigDecimal.ROUND_HALF_UP); - //资源学习成绩 + BigDecimal resourceScore = stuUser.getResourceScore().multiply(resultsOverviewWeight.getResourceLearningWeight()).setScale(2,BigDecimal.ROUND_HALF_UP); BigDecimal learningAssessmentScore = stuUser.getLearningAssessmentScore().multiply(resultsOverviewWeight.getLearningAssessmentWeight()).setScale(2,BigDecimal.ROUND_HALF_UP); - //数字化治理 + BigDecimal experimentTrainingScore = stuUser.getExperimentTrainingScore().multiply(resultsOverviewWeight.getExperimentalTrainingWeight()).setScale(2,BigDecimal.ROUND_HALF_UP); BigDecimal testReportSocre = stuUser.getTestReportSocre().multiply(resultsOverviewWeight.getReportWeight()).setScale(2,BigDecimal.ROUND_HALF_UP); this.totalScore=summaryKnowledgeScore.add(resourceScore).add(learningAssessmentScore)