diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index afb38232..79d08d47 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java @@ -1242,7 +1242,7 @@ public class StudyCourseApi extends ApiBaseController{ * @param courseId 课程id * @param contentId 内容id * @param name 用户名称 - * @param status 用户学习状态(1-未开始,2-已完成,3-进行中) + * @param status 考试状态(2-考试已通过,4-考试未通过) * @return 资源学习情况分页集合 */ @RequestMapping(value = "/contents-exam", method = {RequestMethod.GET, RequestMethod.POST}) @@ -1257,7 +1257,6 @@ public class StudyCourseApi extends ApiBaseController{ if (studyExams == null || studyExams.isEmpty()) { return success(new PageList<>()); } - List studyCourseItemIds = studyExams.stream().map(StudyExam::getStudyItemId).collect(Collectors.toList()); // 分页查询资源学习信息(只查询有考试信息的部分) PageList rs = studyService.findItemPage(pager.getPageIndex(), pager.getPageSize(), null, contentId, courseId, name, status); // 拼接考试信息 diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index eb74cefc..12fd676a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -284,6 +284,10 @@ public class StudyServiceImpl implements IStudyService{ // 未开始(结合现有数据,这里筛选状态为1及为null的数据) query.addFilter(FieldFilters.or(FieldFilters.eq("status", 1), FieldFilters.isNull("status"))); return scItemDao.findPage(query.builder()); + } else if (status == 4) { + // 25.12.16修改,添加筛选已完成数据之外的情况 + query.addFilter(FieldFilters.ne("status", 9)); + return scItemDao.findPage(query.builder()); } } // 未传输status的情况,查询所有资源学习情况数据