Merge remote-tracking branch 'yx/zcwy0716-llf' into dev0525

This commit is contained in:
nisen
2024-07-17 10:22:00 +08:00

View File

@@ -187,14 +187,14 @@ public class StudyServiceImpl implements IStudyService{
query.addFilter(FieldFilters.eq("progress",100));
}else if(status == 1){
List<StudyCourseItem> studyCourseItemPageList = new ArrayList<>();
String from= StudyCourse.class.getSimpleName()+" bsc,"+ StudyCourseItem.class.getSimpleName()+" item";
String from= StudyCourse.class.getSimpleName()+" bsc "+ StudyCourseItem.class.getSimpleName()+" item";
QueryBuilder builder = QueryBuilder.from(from);
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addFilter(FieldFilters.eqField("bsc.courseId","item.courseId"));
query.addFilter(FieldFilters.eq("item.aname", name));
query.addFilter(FieldFilters.eq("item.courseId",courseId));
query.addFilter(FieldFilters.eq("item.contentId",contentId));
builder.addFilter(FieldFilters.eq("item.aname", name));
builder.addFilter(FieldFilters.eq("item.courseId",courseId));
builder.addFilter(FieldFilters.eq("item.contentId",contentId));
builder.addFilter(FieldFilters.ne("bsc.status",9));
builder.addFilter(FieldFilters.ne("bsc.status",2));
// scItemDao.findPage(builder.builder());