From 80c5c956d8bef96a184aa5d01ec00cc29c98c00f Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Mon, 16 Jun 2025 11:13:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=B0=8F=E7=8F=ADbug=EF=BC=8C=E6=80=9D?=
 =?UTF-8?q?=E8=80=83=E9=A2=98=E8=AF=84=E5=88=86=E5=88=97=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=88=90=E7=BB=A9=E4=BF=9D=E7=95=99=E4=B8=A4?=
 =?UTF-8?q?=E4=BD=8D=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/common/service/impl/ClassEntityServiceImpl.java | 6 +++++-
 1 file changed, 5 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 8d558906..ba40ffe4 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
@@ -632,7 +632,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
         wrapper.selectAll(ClassEntity.class);
         wrapper.eq(ClassEntity::getState,"0");
         String classSql = "select 1 from ( select c.id from class c left join class_course cc on cc.model_id = c.model_id left join class_user cu on cu.class_id = c.id where c.del_flag = 0 and cc.del_flag = 0 and cu.del_flag = 0 and cu.user_id = "+ShiroUtils.getUId()+" ) s where s.id = t.id";
-        String courseSql = "select 1 from (select cc.model_id from class_course cc where cc.del_flag = 0 and cc.course_id in (select cc.course_id from class_course cc left join class_model cm on cm.id = cc.model_id left join class c on c.model_id = cm.id left join class_user cu on cu.class_id = c.id where cc.del_flag = 0 and cm.del_flag = 0 and c.del_flag = 0 and cu.del_flag = 0 and cu.user_id = "+ShiroUtils.getUId()+")) q where q.model_id = t.model_id";
+        String courseSql = "select 1 from (select cc.model_id from class_course cc where cc.del_flag = 0 and cc.course_id in (select cc.course_id from class_course cc left join class_model cm on cm.id = cc.model_id left join class c on c.model_id = cm.id left join class_user cu on cu.class_id = c.id where cc.del_flag = 0 and cm.del_flag = 0 and c.del_flag = 0 and cu.del_flag = 0 and c.state != 2 and cu.user_id = "+ShiroUtils.getUId()+")) q where q.model_id = t.model_id";
         wrapper.notExists(classSql);
         wrapper.notExists(courseSql);
         return this.baseMapper.selectList(wrapper);
@@ -1284,6 +1284,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
                 ClassTaskAndQuesReply reply = classTaskAndQuesReplyDao.selectOne(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
                         .eq(ClassTaskAndQuesReply::getRelationId,m.get("id"))
                         .eq(ClassTaskAndQuesReply::getType,"1")
+                        .eq(ClassTaskAndQuesReply::getClassId,params.get("classId"))
                         .eq(ClassTaskAndQuesReply::getUserId,ShiroUtils.getUId()));
                 m.put("reply",reply);
             }
@@ -1463,10 +1464,13 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
             if (experienceScore.compareTo(new BigDecimal(classModel.getExperienceScore()))>-1){
                 experienceScore = new BigDecimal(classModel.getExperienceScore());
             }
+            experienceScore = experienceScore.setScale(2,RoundingMode.HALF_UP);
             map.put("experienceScore",experienceScore);
             usualScore = usualScore.add(experienceScore);
             userScore = userScore.add(experienceScore);
         }
+        usualScore = usualScore.setScale(2,RoundingMode.HALF_UP);
+        userScore = userScore.setScale(2,RoundingMode.HALF_UP);
         map.put("usualScore",usualScore);
         map.put("userScore",userScore);