From 6bdc0a0d429bd2499b61c791738e8da4ed81cb26 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Tue, 10 Sep 2024 09:08:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B9=B3=E6=97=B6=E6=88=90?=
 =?UTF-8?q?=E7=BB=A9=E6=80=BB=E5=92=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/impl/ClassEntityServiceImpl.java       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
index 6ec77d7b..9000708c 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
@@ -1111,7 +1111,8 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
             map.put("examScore",examScore);
             map.put("classExamUsers",classExamUsers);
         }
-        BigDecimal userScore = new BigDecimal(0);;
+        BigDecimal usualScore = new BigDecimal(0);
+        BigDecimal userScore = new BigDecimal(0);
         double staticScore = 2.5;
         if(classModel.getIsExam()==1){
             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.setScale(2,RoundingMode.HALF_UP);
                 map.put("questionScore",questionScore);
+                usualScore = usualScore.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.setScale(2,RoundingMode.HALF_UP);
                 map.put("task0Score",task0Score);
+                usualScore = usualScore.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.setScale(2,RoundingMode.HALF_UP);
                 map.put("task1Score",task1Score);
+                usualScore = usualScore.add(task1Score);
                 userScore = userScore.add(task1Score);
             }
         }
@@ -1171,8 +1175,10 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
                 experienceScore = new BigDecimal(classModel.getExperienceScore());
             }
             map.put("experienceScore",experienceScore);
+            usualScore = usualScore.add(experienceScore);
             userScore = userScore.add(experienceScore);
         }
+        map.put("usualScore",usualScore);
         map.put("userScore",userScore);
 
         return map;