From 5890f1b8004f6d547bba7f7804d2a973be5d2534 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 26 Jul 2024 22:04:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/study/service/impl/StudyServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index 11731bb0..16fa2805 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -184,12 +184,11 @@ public class StudyServiceImpl implements IStudyService{ } if(status!=null) { if(status==3) { - query.addFilter(FieldFilters.eq("status", 2)); - query.addGroupBy("studyId"); + query.addFilter(FieldFilters.gt("progress", 0)); + query.addFilter(FieldFilters.eq("progress", 100)); return scItemDao.findPage(query.builder()); }else if(status==2){ - query.addFilter(FieldFilters.eq("status",9)); - query.addGroupBy("studyId"); + query.addFilter(FieldFilters.eq("progress",100)); return scItemDao.findPage(query.builder()); }else if (status == 1) { String sql = "select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.content_id,0 as progress,1 as status from boe_study_course bsc " + @@ -249,14 +248,14 @@ public class StudyServiceImpl implements IStudyService{ // " where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by bsc.id" + // " )group by bsc.id) a group by a.id"; String sql = "select a.id, a.course_id, a.course_name, a.aname, " + - "IFNULL(b.finish_time, 0) as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " + + "IFNULL(b.finish_time, '0') as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " + "from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "') a " + "left join " + "(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status " + "from boe_study_course bsc left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " + "where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' group by bsc.id) b " + "on a.course_id = b.course_id and a.id = b.id " + - "group by a.id"; + "group by a.id limit "+ pageIndex+","+ pageSize+";"; String sql2 = "select count(*) as total from (select a.id, a.course_id, a.course_name, a.aname, " + "IFNULL(b.finish_time, 0) as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " + "from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "') a " +