From 2f150449fe666f0a07013e2ec57c74b63c3f610e Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 24 Jul 2024 10:50:08 +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 | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 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 bf521d31..dd133c43 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 @@ -209,8 +209,30 @@ public class StudyServiceImpl implements IStudyService{ return pageList; } } - - return scItemDao.findPage(query.builder()); + String sql2 = "select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,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.`status` in (2,9) and bsc.course_id = '"+ courseId+"' " + + "UNION ALL " + + " select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,0 as progress,1 as status from boe_study_course bsc " + + " LEFT JOIN boe_study_course_item item on item.course_id = bsc.course_id " + + " where bsc.course_id = '"+courseId+"' and bsc.id != (" + + " select bsc.id 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+"'" + + " )"; + List list = scDao.sqlFindList(sql2); + List item = new ArrayList<>(); + for (Object[] objs : list) { + StudyCourseItem sc = new StudyCourseItem(); + sc.setCourseId(objs[1].toString()); + sc.setContentId(objs[4].toString()); + sc.setProgress((Integer) objs[5]); + sc.setStatus((Integer) objs[6]); + sc.setAname(objs[3].toString()); + item.add(sc); + } + PageList pageList = new PageList<>(item); + return pageList; }