添加平时成绩总和

This commit is contained in:
wuchunlei
2024-09-10 09:08:35 +08:00
parent c3252e2966
commit 6bdc0a0d42

View File

@@ -1111,7 +1111,8 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
map.put("examScore",examScore); map.put("examScore",examScore);
map.put("classExamUsers",classExamUsers); map.put("classExamUsers",classExamUsers);
} }
BigDecimal userScore = new BigDecimal(0);; BigDecimal usualScore = new BigDecimal(0);
BigDecimal userScore = new BigDecimal(0);
double staticScore = 2.5; double staticScore = 2.5;
if(classModel.getIsExam()==1){ if(classModel.getIsExam()==1){
BigDecimal examScore = new BigDecimal(map.get("examScore").toString()); BigDecimal examScore = new BigDecimal(map.get("examScore").toString());
@@ -1132,6 +1133,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
questionScore = questionScore.multiply(new BigDecimal(classModel.getQuestionScore())); questionScore = questionScore.multiply(new BigDecimal(classModel.getQuestionScore()));
questionScore = questionScore.setScale(2,RoundingMode.HALF_UP); questionScore = questionScore.setScale(2,RoundingMode.HALF_UP);
map.put("questionScore",questionScore); map.put("questionScore",questionScore);
usualScore = usualScore.add(questionScore);
userScore = userScore.add(questionScore); userScore = userScore.add(questionScore);
} }
} }
@@ -1147,6 +1149,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
task0Score = task0Score.multiply(new BigDecimal(classModel.getTaskScore())); task0Score = task0Score.multiply(new BigDecimal(classModel.getTaskScore()));
task0Score = task0Score.setScale(2,RoundingMode.HALF_UP); task0Score = task0Score.setScale(2,RoundingMode.HALF_UP);
map.put("task0Score",task0Score); map.put("task0Score",task0Score);
usualScore = usualScore.add(task0Score);
userScore = userScore.add(task0Score); userScore = userScore.add(task0Score);
} }
} }
@@ -1162,6 +1165,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
task1Score = task1Score.multiply(new BigDecimal(classModel.getMedicalcaseScore())); task1Score = task1Score.multiply(new BigDecimal(classModel.getMedicalcaseScore()));
task1Score = task1Score.setScale(2,RoundingMode.HALF_UP); task1Score = task1Score.setScale(2,RoundingMode.HALF_UP);
map.put("task1Score",task1Score); map.put("task1Score",task1Score);
usualScore = usualScore.add(task1Score);
userScore = userScore.add(task1Score); userScore = userScore.add(task1Score);
} }
} }
@@ -1171,8 +1175,10 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
experienceScore = new BigDecimal(classModel.getExperienceScore()); experienceScore = new BigDecimal(classModel.getExperienceScore());
} }
map.put("experienceScore",experienceScore); map.put("experienceScore",experienceScore);
usualScore = usualScore.add(experienceScore);
userScore = userScore.add(experienceScore); userScore = userScore.add(experienceScore);
} }
map.put("usualScore",usualScore);
map.put("userScore",userScore); map.put("userScore",userScore);
return map; return map;