Merge branch 'zcwy0716-llf' into master-0705

This commit is contained in:
nisen
2024-07-26 17:31:26 +08:00

View File

@@ -195,7 +195,9 @@ public class StudyServiceImpl implements IStudyService{
" left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " + " left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
" where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"'" + " where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"'" +
" )"; " )";
log.info("资源完成情况未开始sql"+sql);
List<Object[]> list = scDao.sqlFindList(sql); List<Object[]> list = scDao.sqlFindList(sql);
log.info("资源完成情况未开始人数"+list);
List<StudyCourseItem> item = new ArrayList<>(); List<StudyCourseItem> item = new ArrayList<>();
for (Object[] objs : list) { 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 +"'"; 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 +"'";
@@ -208,6 +210,7 @@ public class StudyServiceImpl implements IStudyService{
item.add(sc); item.add(sc);
} }
} }
log.info("资源完成情况未开始人员"+item);
PageList<StudyCourseItem> pageList = new PageList<>(item); PageList<StudyCourseItem> pageList = new PageList<>(item);
return pageList; return pageList;
} }
@@ -223,7 +226,9 @@ public class StudyServiceImpl implements IStudyService{
" left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " + " left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
" where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"'" + " where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"'" +
" )) a group by a.id"; " )) a group by a.id";
log.info("资源完成情况全部sql"+sql2);
List<Object[]> list = scDao.sqlFindList(sql2); List<Object[]> list = scDao.sqlFindList(sql2);
log.info("资源完成情况人数"+list);
List<StudyCourseItem> item = new ArrayList<>(); List<StudyCourseItem> item = new ArrayList<>();
for (Object[] objs : list) { for (Object[] objs : list) {
StudyCourseItem sc = new StudyCourseItem(); StudyCourseItem sc = new StudyCourseItem();
@@ -232,6 +237,7 @@ public class StudyServiceImpl implements IStudyService{
sc.setAname(objs[3].toString()); sc.setAname(objs[3].toString());
item.add(sc); item.add(sc);
} }
log.info("资源完成情况人员"+item);
PageList<StudyCourseItem> pageList = new PageList<>(item); PageList<StudyCourseItem> pageList = new PageList<>(item);
return pageList; return pageList;