Merge branch 'zcwy0716-llf' into dev0525

This commit is contained in:
nisen
2024-07-23 16:55:44 +08:00

View File

@@ -186,10 +186,10 @@ public class StudyServiceImpl implements IStudyService{
}else if(status==2){
query.addFilter(FieldFilters.eq("status",9));
}else if (status == 1) {
String sql = "select id, course_id, course_name, aname from boe_study_course where course_id = '" + courseId + "'";
String sql = "select bsc.id, bsc.course_id, bsc.course_name, bsc.aname from boe_study_course bsc " +
" left join boe_study_course_item item on item.course_id = bsc.course_id " +
" where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' and bsc.`status` !=9 and item.`status` !=2";
List<Object[]> list = scDao.sqlFindList(sql);
query.addFilter(FieldFilters.ne("status", 2));
query.addFilter(FieldFilters.ne("status", 9));
List<StudyCourseItem> item = new ArrayList<>();
for (Object[] objs : list) {
String sql2 = "select id, course_id, content_name, aname from boe_study_course_item where `status` !=2 and `status` !=9 and course_id = '" + courseId + "' and content_id = '"+contentId +"'";