mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-08 18:36:51 +08:00
修复在线管理资源完成情况搜索框不能同时搜索问题
This commit is contained in:
@@ -180,22 +180,24 @@ public class StudyServiceImpl implements IStudyService{
|
|||||||
query.addFilter(FieldFilters.eq("courseId",courseId));
|
query.addFilter(FieldFilters.eq("courseId",courseId));
|
||||||
}
|
}
|
||||||
if(StringUtils.isNotBlank(name)) {
|
if(StringUtils.isNotBlank(name)) {
|
||||||
query.addFilter(FieldFilters.eq("aname", name));
|
query.addFilter(FieldFilters.like("aname", name));
|
||||||
}
|
}
|
||||||
int pageIndex2 = pageIndex-1;
|
int pageIndex2 = pageIndex-1;
|
||||||
if(status!=null) {
|
if(status!=null) {
|
||||||
if(status==3) {
|
if(status==3) {
|
||||||
query.addFilter(FieldFilters.eq("status", 2));
|
query.addFilter(FieldFilters.eq("status", 2));
|
||||||
|
query.addFilter(FieldFilters.like("aname", name));
|
||||||
return scItemDao.findPage(query.builder());
|
return scItemDao.findPage(query.builder());
|
||||||
}else if(status==2){
|
}else if(status==2){
|
||||||
query.addFilter(FieldFilters.eq("status",9));
|
query.addFilter(FieldFilters.eq("status",9));
|
||||||
|
query.addFilter(FieldFilters.like("aname", name));
|
||||||
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,item.content_id,0 as progress,1 as status 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 " +
|
||||||
" 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 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 " +
|
||||||
|
|||||||
Reference in New Issue
Block a user