Merge branch 'zcwy0716-llf' into master-0705

This commit is contained in:
nisen
2024-07-26 22:16:40 +08:00

View File

@@ -184,11 +184,10 @@ public class StudyServiceImpl implements IStudyService{
}
if(status!=null) {
if(status==3) {
query.addFilter(FieldFilters.gt("progress", 0));
query.addFilter(FieldFilters.lt("progress", 100));
query.addFilter(FieldFilters.gt("status", 2));
return scItemDao.findPage(query.builder());
}else if(status==2){
query.addFilter(FieldFilters.eq("progress",100));
query.addFilter(FieldFilters.eq("status",9));
return scItemDao.findPage(query.builder());
}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 " +