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 4454ffe5..dd8cc113 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,10 +190,10 @@ 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 != (" + + " 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+"'" + + " where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by bsc.id" + " )"; log.info("资源完成情况未开始sql"+sql); List list = scDao.sqlFindList(sql); @@ -217,15 +217,15 @@ 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+"' " + + "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 != (" + + " 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+"'" + - " )) a group by a.id"; + " where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by bsc.id" + + " )group by bsc.id) a group by a.id"; log.info("资源完成情况全部sql"+sql2); List list = scDao.sqlFindList(sql2); log.info("资源完成情况人数"+list);