From e989ebeacfe817b140b9b5031f7ffeba26f1bfeb Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Wed, 21 May 2025 14:16:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=8F=AD=E8=AF=84?=
 =?UTF-8?q?=E5=88=86=E5=88=97=E8=A1=A8=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/common/entity/ClassTask.java      |  2 ++
 .../common/entity/ClassTaskAndQuesReply.java  |  2 ++
 .../service/impl/ClassEntityServiceImpl.java  | 34 +++++++++----------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/entity/ClassTask.java b/src/main/java/com/peanut/modules/common/entity/ClassTask.java
index 358e0964..581e01dc 100644
--- a/src/main/java/com/peanut/modules/common/entity/ClassTask.java
+++ b/src/main/java/com/peanut/modules/common/entity/ClassTask.java
@@ -48,4 +48,6 @@ public class ClassTask {
     private boolean isReply;
     @TableField(exist = false)
     private Object otherInfo;
+    @TableField(exist = false)
+    private int flag;
 }
diff --git a/src/main/java/com/peanut/modules/common/entity/ClassTaskAndQuesReply.java b/src/main/java/com/peanut/modules/common/entity/ClassTaskAndQuesReply.java
index 9a4f5b53..b6908ffd 100644
--- a/src/main/java/com/peanut/modules/common/entity/ClassTaskAndQuesReply.java
+++ b/src/main/java/com/peanut/modules/common/entity/ClassTaskAndQuesReply.java
@@ -42,4 +42,6 @@ public class ClassTaskAndQuesReply {
 
     @TableField(exist = false)
     private Object createUser;
+    @TableField(exist = false)
+    private int flag;
 }
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 8257bd2a..1610fdd2 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
@@ -876,11 +876,13 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
     public Page getClassTaskList(Map<String, Object> params) {
         Integer limit = Integer.valueOf(params.get("limit").toString());
         Integer page = Integer.valueOf(params.get("page").toString());
-        LambdaQueryWrapper<ClassTask> wrapper = new LambdaQueryWrapper<>();
+        MPJLambdaWrapper<ClassTask> wrapper = new MPJLambdaWrapper<>();
         wrapper.eq(ClassTask::getClassId,params.get("classId"));
         if (StringUtils.isNotEmpty(params.get("type").toString())){
             if ("2".equals(params.get("type").toString())){
-                wrapper.orderByAsc(ClassTask::getScoreSuccess);
+                wrapper.selectAll(ClassTask.class);
+                wrapper.select("IF(LOCATE('"+"\""+ShiroUtils.getUId()+"\""+"', score_info)>0,1,0) as flag");
+                wrapper.orderByAsc("flag");
             }
             wrapper.eq(ClassTask::getType,params.get("type"));
         }
@@ -1006,11 +1008,13 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
     public Page getReplyListByTaskId(Map<String, Object> params) {
         Integer limit = Integer.valueOf(params.get("limit").toString());
         Integer page = Integer.valueOf(params.get("page").toString());
-        LambdaQueryWrapper<ClassTaskAndQuesReply> wrapper = new LambdaQueryWrapper<>();
+        MPJLambdaWrapper<ClassTaskAndQuesReply> wrapper = new MPJLambdaWrapper<>();
         wrapper.eq(ClassTaskAndQuesReply::getType,0);
         wrapper.eq(ClassTaskAndQuesReply::getRelationId,params.get("taskId"));
-        wrapper.orderByAsc(ClassTaskAndQuesReply::getScoreSuccess);
-        wrapper.orderByDesc(ClassTaskAndQuesReply::getCreateTime);
+        wrapper.selectAll(ClassTaskAndQuesReply.class);
+        wrapper.select("IF(LOCATE('"+"\""+ShiroUtils.getUId()+"\""+"', score_info)>0,1,0) as flag");
+        wrapper.orderByAsc("flag");
+        wrapper.orderByAsc(ClassTaskAndQuesReply::getCreateTime);
         Page<ClassTaskAndQuesReply> TaskAndQuesReplyPage = classTaskAndQuesReplyDao.selectPage(new Page<>(page, limit), wrapper);
         for (ClassTaskAndQuesReply classTaskAndQuesReply :TaskAndQuesReplyPage.getRecords()){
             classTaskAndQuesReply.setCreateUser(myUserDao.selectById(classTaskAndQuesReply.getUserId()));
@@ -1225,8 +1229,10 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
         replyWrap.leftJoin(ClassCourse.class,ClassCourse::getCourseId,CourseCatalogueChapterEntity::getCourseId);
         replyWrap.leftJoin(CourseEntity.class,CourseEntity::getId,ClassCourse::getCourseId);
         replyWrap.leftJoin(ClassEntity.class,ClassEntity::getModelId,ClassCourse::getModelId);
-        replyWrap.eq(ClassEntity::getId,params.get("classId"));
+        replyWrap.distinct();
+        replyWrap.eq(ClassTaskAndQuesReply::getClassId,params.get("classId"));
         replyWrap.eq(ClassTaskAndQuesReply::getType,"1");
+        replyWrap.select("IF(LOCATE('"+"\""+ShiroUtils.getUId()+"\""+"', score_info)>0,1,0) as flag");
         replyWrap.selectAs(ClassTaskAndQuesReply::getId,"replyId");
         replyWrap.selectAs(ClassTaskAndQuesReply::getContent,"content");
         replyWrap.selectAs(ClassTaskAndQuesReply::getImg,"img");
@@ -1237,20 +1243,12 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
         replyWrap.selectAs(CourseCatalogueChapterEntity::getTitle,"chapterTitle");
         replyWrap.selectAs(CourseEntity::getTitle,"courseTitle");
         replyWrap.selectAs(CourseCatalogueChapterEntity::getQuestions,"questions");
-        replyWrap.orderByAsc(ClassTaskAndQuesReply::getScoreSuccess);
+        replyWrap.selectAs(ClassTaskAndQuesReply::getCreateTime,"createTime");
+        replyWrap.orderByAsc("flag");
+        replyWrap.orderByAsc("createTime");
         Page<Map<String,Object>> replyPage = classTaskAndQuesReplyDao.selectMapsPage(new Page<>(page, limit), replyWrap);
         for (Map<String,Object> map:replyPage.getRecords()){
-            int alreadyReply = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
-                    .eq(ClassTaskAndQuesReply::getType,1)
-                    .eq(ClassTaskAndQuesReply::getRelationId,params.get("classId")));
-            int userNoCount = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
-                    .eq(ClassTaskAndQuesReply::getType,1)
-                    .eq(ClassTaskAndQuesReply::getRelationId,params.get("classId"))
-                    .notLike(ClassTaskAndQuesReply::getScoreInfo,"\""+ShiroUtils.getUId()+"\""));
-            Map<String,Object> result = new HashMap<>();
-            result.put("setGiveHomeWorkNumber",alreadyReply);
-            result.put("userNoCount",userNoCount);
-            map.put("otherInfo",result);
+            map.put("otherInfo","");
         }
         return replyPage;
     }