hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-11 20:06:51 +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 20:53:21 +08:00
parent faea4f8b2a e6f4affa21
commit 66d7f2a3cf
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,7 +196,7 @@ public class StudyServiceImpl implements IStudyService{
" 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";
" ) group by bsc.id limit "+ pageIndex+","+ pageSize+";";
String sql2 = "select count(*) 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" +
@@ -217,6 +217,9 @@ public class StudyServiceImpl implements IStudyService{
}
log.info("资源完成情况人员"+item);
PageList<StudyCourseItem> pageList = new PageList<>(item);
pageList.setCount(Integer.parseInt(sql2));
pageList.setPageSize(pageSize);
pageList.setList(item);
return pageList;
}
}
@@ -245,15 +248,15 @@ public class StudyServiceImpl implements IStudyService{
// " )group by bsc.id) a group by a.id";
String sql = "select a.id, a.course_id, a.course_name, a.aname, " +
"IFNULL(b.finish_time, 0) as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " +
" from (select id,course_id,course_name,aname,0,1 from boe_study_course where course_id = ‘"+courseId+"')a " +
"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "') a " +
"left join " +
"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, 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.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' group by bsc.id) b " +
"on a.course_id = b.course_id and a.id = b.id " +
"group by a.id";
String sql2 = "select count(*) as status " +
" from (select id,course_id,course_name,aname,0,1 from boe_study_course where course_id = ‘"+courseId+"')a " +
String sql2 = "select count(*) " +
"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "') a " +
"left join " +
"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, 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 " +