hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-10 11:26: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:18:17 +08:00
parent a93580c387 650107aea1
commit 5a05ff74b7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,7 @@ public class StudyServiceImpl implements IStudyService{
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 from boe_study_course bsc " + 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 not in (" + " where bsc.course_id = '"+courseId+"' and bsc.id not in(" +
" 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" +
@@ -200,7 +200,7 @@ public class StudyServiceImpl implements IStudyService{
log.info("资源完成情况未开始人数"+list); log.info("资源完成情况未开始人数"+list);
List<StudyCourseItem> item = new ArrayList<>(); List<StudyCourseItem> item = new ArrayList<>();
for (Object[] objs : list) { for (Object[] objs : list) {
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 +"'"; 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";
List<Object[]> itemList = scItemDao.sqlFindList(sql2);// 执行查询 List<Object[]> itemList = scItemDao.sqlFindList(sql2);// 执行查询
if (itemList.isEmpty()) { if (itemList.isEmpty()) {
StudyCourseItem sc = new StudyCourseItem(); StudyCourseItem sc = new StudyCourseItem();
@@ -217,8 +217,8 @@ 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 " + 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 " + "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+"' group by bsc.id" + "where bsc.`status` in (2,9) and bsc.course_id = '"+ courseId+"' group by bsc.id " +
"UNION ALL " + " UNION ALL " +
" select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,0 as progress,1 as status from boe_study_course bsc " + " 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 " + " LEFT JOIN boe_study_course_item item on item.course_id = bsc.course_id " +
" where bsc.course_id = '"+courseId+"' and bsc.id not in (" + " where bsc.course_id = '"+courseId+"' and bsc.id not in (" +