From e6f4affa2159c6bef94280cb0ccd7701bfa21706 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 26 Jul 2024 20:51:55 +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 --- .../study/service/impl/StudyServiceImpl.java | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 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 22a65aa2..22cb9484 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 @@ -196,7 +196,7 @@ public class StudyServiceImpl implements IStudyService{ " where bsc.course_id = '"+courseId+"' and bsc.id not in(" + " select item.study_id from boe_study_course_item item " + " where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by item.study_id" + - " ) group by bsc.id"; + " ) group by bsc.id limit "+ pageIndex+","+ pageSize+";"; String sql2 = "select count(*) from boe_study_course bsc " + " left join boe_study_course_item item on bsc.course_id = item.course_id and bsc.id = item.study_id" + @@ -217,6 +217,9 @@ public class StudyServiceImpl implements IStudyService{ } log.info("资源完成情况人员"+item); PageList pageList = new PageList<>(item); + pageList.setCount(Integer.parseInt(sql2)); + pageList.setPageSize(pageSize); + pageList.setList(item); return pageList; } } @@ -243,23 +246,23 @@ public class StudyServiceImpl implements IStudyService{ // " 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" + // " )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 " + - " 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"; - String sql2 = "select count(*) 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"; + 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 " + + "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"; + String sql2 = "select count(*) " + + "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"; log.info("资源完成情况全部sql"+sql); List list = scDao.sqlFindList(sql); log.info("资源完成情况人数"+list);