From eedaf1371195cb877d6d03ce9ac437305f32358c Mon Sep 17 00:00:00 2001 From: miaowenbo <1670593359@qq.com> Date: Tue, 16 Dec 2025 10:51:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E3=80=90FCJDFDXTXS-136=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=80=83=E8=AF=95=E7=9A=84=E6=9F=A5=E8=AF=A2=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=8C=E8=80=83=E8=AF=95=E9=80=9A=E8=BF=87-2?= =?UTF-8?q?=EF=BC=8C=E8=80=83=E8=AF=95=E6=9C=AA=E9=80=9A=E8=BF=87-4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/school/study/api/StudyCourseApi.java | 3 +-- .../com/xboe/school/study/service/impl/StudyServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) 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的情况，查询所有资源学习情况数据