hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-08 02:16:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy0716-llf' into master-0705

Browse Source
This commit is contained in:
nisen
2024-07-26 18:59:20 +08:00
parent 63867db58e d0b1894c14
commit 6bf5ccbcec
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
View File

@@ -189,24 +189,25 @@ public class StudyServiceImpl implements IStudyService{
query.addFilter(FieldFilters.eq("status",9)); query.addFilter(FieldFilters.eq("status",9));
return scItemDao.findPage(query.builder()); return scItemDao.findPage(query.builder());
}else if (status == 1) { }else if (status == 1) {
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 " + String sql = "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 bsc.course_id = item.course_id and bsc.id = item.study_id" +
" where bsc.course_id = '"+courseId+"' and bsc.id not in(" + " where bsc.course_id = '"+courseId+"' and bsc.id not in(" +
" select item.study_id from boe_study_course_item item " + " 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" + " where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by item.study_id" +
" ) group by bsc.id"; " ) group by bsc.id";
log.info("资源完成情况未开始sql"+sql); log.info("资源完成情况未开始sql"+sql);
List<Object[]> list = scDao.sqlFindList(sql); List<Object[]> list = scDao.sqlFindList(sql);
log.info("资源完成情况未开始人数"+list); log.info("资源完成情况人数"+list);
List<StudyCourseItem> item = new ArrayList<>(); List<StudyCourseItem> item = new ArrayList<>();
for (Object[] objs : list) { for (Object[] objs : list) {
StudyCourseItem sc = new StudyCourseItem(); StudyCourseItem sc = new StudyCourseItem();
sc.setProgress(Integer.valueOf(objs[5].toString())); sc.setProgress(Integer.valueOf(objs[5].toString()));
sc.setStatus(Integer.valueOf(objs[6].toString())); sc.setStatus(Integer.valueOf(objs[6].toString()));
sc.setAname(objs[3].toString()); sc.setAname(objs[3].toString());
item.add(sc); item.add(sc);
} }
log.info("资源完成情况未开始人员"+item); log.info("资源完成情况人员"+item);
PageList<StudyCourseItem> pageList = new PageList<>(item); PageList<StudyCourseItem> pageList = new PageList<>(item,pageSize);
return pageList; return pageList;
} }
} }
@@ -220,7 +221,7 @@ public class StudyServiceImpl implements IStudyService{
" select bsc.id from boe_study_course bsc " + " 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 " + " 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" + " where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by bsc.id" +
" )group by bsc.id) a group by a.id limit "+pageIndex+","+pageSize +""; " )group by bsc.id) a group by a.id";
log.info("资源完成情况全部sql"+sql2); log.info("资源完成情况全部sql"+sql2);
List<Object[]> list = scDao.sqlFindList(sql2); List<Object[]> list = scDao.sqlFindList(sql2);
log.info("资源完成情况人数"+list); log.info("资源完成情况人数"+list);
@@ -233,7 +234,7 @@ public class StudyServiceImpl implements IStudyService{
item.add(sc); item.add(sc);
} }
log.info("资源完成情况人员"+item); log.info("资源完成情况人员"+item);
PageList<StudyCourseItem> pageList = new PageList<>(item); PageList<StudyCourseItem> pageList = new PageList<>(item, pageSize);
return pageList; return pageList;
} }