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

Merge branch 'zcwy0716-llf' into dev0525

Browse Source
This commit is contained in:
nisen
2024-07-24 10:51:00 +08:00
parent 973c6fb9f5 2f150449fe
commit 653a617912
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,8 +209,30 @@ public class StudyServiceImpl implements IStudyService{
return pageList;
}
}
return scItemDao.findPage(query.builder());
String sql2 = "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+"' " +
"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 != (" +
" 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+"'" +
" )";
List<Object[]> list = scDao.sqlFindList(sql2);
List<StudyCourseItem> item = new ArrayList<>();
for (Object[] objs : list) {
StudyCourseItem sc = new StudyCourseItem();
sc.setCourseId(objs[1].toString());
sc.setContentId(objs[4].toString());
sc.setProgress((Integer) objs[5]);
sc.setStatus((Integer) objs[6]);
sc.setAname(objs[3].toString());
item.add(sc);
}
PageList<StudyCourseItem> pageList = new PageList<>(item);
return pageList;
}