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

This commit is contained in:
nisen
2024-07-17 09:47:39 +08:00

View File

@@ -197,16 +197,16 @@ public class StudyServiceImpl implements IStudyService{
query.addFilter(FieldFilters.eq("item.contentId",contentId));
builder.addFilter(FieldFilters.ne("bsc.status",9));
builder.addFilter(FieldFilters.ne("bsc.status",2));
List<StudyCourse> scDaoList = scDao.findList(builder.builder());
for (StudyCourse bsc : scDaoList){
StudyCourseItem item = new StudyCourseItem();
item.setAid(bsc.getAid());
item.setCourseId(bsc.getCourseId());
item.setAname(bsc.getAname());
item.setProgress(Integer.valueOf(String.valueOf(bsc.getProgress())));
studyCourseItemPageList.add(item);
}
return (PageList<StudyCourseItem>) studyCourseItemPageList;
// scItemDao.findPage(builder.builder());
// for (StudyCourse bsc : scDaoList){
// StudyCourseItem item = new StudyCourseItem();
// item.setAid(bsc.getAid());
// item.setCourseId(bsc.getCourseId());
// item.setAname(bsc.getAname());
// item.setProgress(Integer.valueOf(String.valueOf(bsc.getProgress())));
// studyCourseItemPageList.add(item);
// }
return scItemDao.findPage(builder.builder());
}
}