hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-09 02:46:50 +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:45:50 +08:00
parent 7ef0f976fc 7e1e32a70e
commit 63867db58e
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,25 +189,21 @@ 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" +
" )";
" ) group by bsc.id";
log.info("资源完成情况未开始sql"+sql);
List<Object[]> list = scDao.sqlFindList(sql);
log.info("资源完成情况未开始人数"+list);
List<StudyCourseItem> 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<Object[]> 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<StudyCourseItem> pageList = new PageList<>(item);