From 650107aea1497f683352fcd5ed68daa799c09daa Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 26 Jul 2024 18:17:39 +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 --- .../xboe/school/study/service/impl/StudyServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 dd8cc113..c8d53e20 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 @@ -190,7 +190,7 @@ public class StudyServiceImpl implements IStudyService{ return scItemDao.findPage(query.builder()); }else if (status == 1) { String sql = "select bsc.id,bsc.course_id,bsc.course_name,bsc.aname from boe_study_course bsc " + - " where bsc.course_id = '"+courseId+"' and bsc.id not in (" + + " where bsc.course_id = '"+courseId+"' and bsc.id not in(" + " 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+"' group by bsc.id" + @@ -200,7 +200,7 @@ public class StudyServiceImpl implements IStudyService{ log.info("资源完成情况未开始人数"+list); List item = new ArrayList<>(); for (Object[] objs : list) { - String sql2 = "select id, course_id, content_name, aname from boe_study_course_item where `status` !=2 and `status` !=9 and course_id = '" + courseId + "' and content_id = '"+contentId +"'"; + String sql2 = "select id, course_id, content_name, aname from boe_study_course_item where `status` !=2 and `status` !=9 and course_id = '" + courseId + "' and content_id = '"+contentId +"' group by id,course_id,content_id"; List itemList = scItemDao.sqlFindList(sql2);// 执行查询 if (itemList.isEmpty()) { StudyCourseItem sc = new StudyCourseItem(); @@ -217,8 +217,8 @@ public class StudyServiceImpl implements IStudyService{ } String sql2 = "select * from (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+"' group by bsc.id" + - "UNION ALL " + + "where bsc.`status` in (2,9) and bsc.course_id = '"+ courseId+"' group by bsc.id " + + " 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 not in (" +