mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-08 10:26:48 +08:00
修复在线管理资源完成情况搜索框不能同时搜索问题
This commit is contained in:
@@ -197,14 +197,14 @@ public class StudyServiceImpl implements IStudyService{
|
|||||||
" left join boe_study_course_item item on bsc.course_id = item.course_id and bsc.id = item.study_id" +
|
" 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.aname like '%"+name+"%' and bsc.id not in(" +
|
" where bsc.course_id = '"+courseId+"' and bsc.aname like '%"+name+"%' 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+"' and status = 1 and item.aname like '%"+name+"%' group by item.study_id" +
|
" where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' and item.status = '1' and item.aname like '%"+name+"%' group by item.study_id" +
|
||||||
" ) group by bsc.id limit "+ pageIndex2+","+ pageSize+";";
|
" ) group by bsc.id limit "+ pageIndex2+","+ pageSize+";";
|
||||||
|
|
||||||
String sql2 = "select count(*) as total from (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 sql2 = "select count(*) as total from (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 " +
|
||||||
" left join boe_study_course_item item on bsc.course_id = item.course_id and bsc.id = item.study_id" +
|
" 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.aname like '%"+name+"%' and bsc.id not in(" +
|
" where bsc.course_id = '"+courseId+"' and bsc.aname like '%"+name+"%' 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+"' and item.aname like '%"+name+"%' group by item.study_id" +
|
" where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' and item.status = '1' and item.aname like '%"+name+"%' group by item.study_id" +
|
||||||
" ) group by bsc.id) as total";
|
" ) group by bsc.id) as total";
|
||||||
log.info("资源完成情况未开始sql"+sql);
|
log.info("资源完成情况未开始sql"+sql);
|
||||||
List<Object[]> list = scDao.sqlFindList(sql);
|
List<Object[]> list = scDao.sqlFindList(sql);
|
||||||
@@ -241,7 +241,7 @@ public class StudyServiceImpl implements IStudyService{
|
|||||||
"left join " +
|
"left join " +
|
||||||
"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status " +
|
"(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 " +
|
"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 + "' and item.aname like '%"+name+"%' group by bsc.id) b " +
|
"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' and item.aname like '%"+name+"%' group by bsc.id) b " +
|
||||||
"on a.course_id = b.course_id and a.id = b.id " +
|
"on a.course_id = b.course_id and a.id = b.id " +
|
||||||
"group by a.id) as total";
|
"group by a.id) as total";
|
||||||
log.info("资源完成情况全部sql"+sql);
|
log.info("资源完成情况全部sql"+sql);
|
||||||
|
|||||||
Reference in New Issue
Block a user