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 da70ebd8..c918698b 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 @@ -189,7 +189,7 @@ public class StudyServiceImpl implements IStudyService{ query.addFilter(FieldFilters.eq("status",9)); 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 " + + 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 " + " 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" + @@ -198,16 +198,12 @@ public class StudyServiceImpl implements IStudyService{ List list = scDao.sqlFindList(sql); log.info("资源完成情况未开始人数"+list); List item = new ArrayList<>(); - 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"; for (Object[] objs : list) { - List itemList = scItemDao.sqlFindList(sql2);// 执行查询 - if (itemList.isEmpty()) { StudyCourseItem sc = new StudyCourseItem(); - sc.setProgress(0); - sc.setStatus(1); + sc.setProgress(Integer.valueOf(objs[5].toString())); + sc.setStatus(Integer.valueOf(objs[6].toString())); sc.setAname(objs[3].toString()); item.add(sc); - } } log.info("资源完成情况未开始人员"+item); PageList pageList = new PageList<>(item);