From 17943448297d913db888769d2f5930b2871c5398 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 09:37:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/service/impl/StudyServiceImpl.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) 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 d827ebeb..05508233 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 @@ -9,6 +9,8 @@ import java.util.Map; import javax.annotation.Resource; import javax.transaction.Transactional; +import com.xboe.module.article.entity.Article; +import com.xboe.module.interaction.entity.Shares; import com.xboe.school.study.entity.StudyCourse; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -184,12 +186,19 @@ public class StudyServiceImpl implements IStudyService{ }else if(status==2){ query.addFilter(FieldFilters.eq("progress",100)); }else if(status == 1){ - List courses = scDao.findList(query.builder()); // 假设这是你的查询方法 List studyCourseItemPageList = new ArrayList<>(); - query.addFilter(FieldFilters.ne("bsc.status",9)); - query.addFilter(FieldFilters.ne("bsc.status",2)); - scItemDao.findPage(query.builder()); - for (StudyCourse bsc : courses){ + String from= StudyCourse.class.getSimpleName()+" bsc,"+ StudyCourseItem.class.getSimpleName()+" item"; + QueryBuilder builder = QueryBuilder.from(from); + builder.setPageIndex(pageIndex); + builder.setPageSize(pageSize); + builder.addFilter(FieldFilters.eqField("bsc.courseId","item.courseId")); + query.addFilter(FieldFilters.eq("item.aname", name)); + query.addFilter(FieldFilters.eq("item.courseId",courseId)); + query.addFilter(FieldFilters.eq("item.contentId",contentId)); + builder.addFilter(FieldFilters.ne("bsc.status",9)); + builder.addFilter(FieldFilters.ne("bsc.status",2)); + List scDaoList = scDao.findList(builder.builder()); + for (StudyCourse bsc : scDaoList){ StudyCourseItem item = new StudyCourseItem(); item.setAid(bsc.getAid()); item.setCourseId(bsc.getCourseId());