From df91242e1b86b0c1dc03fd8817a6112d1fd212eb Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 16 Jul 2024 19:57:36 +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=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/study/service/IStudyService.java | 2 +- .../study/service/impl/StudyServiceImpl.java | 41 ++++++++++++------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java index 9b25520f..e68608b9 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java @@ -94,5 +94,5 @@ public interface IStudyService { * @param status * @return */ - PageList findItemPage(int pageIndex,int pageSize,String contentId,String courseId,String name,Integer status); + PageList findItemPage(int pageIndex, int pageSize, String contentId, String courseId, String name, Integer 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 d6cc2110..393c2d0e 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 @@ -1,6 +1,7 @@ package com.xboe.school.study.service.impl; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -8,7 +9,6 @@ import java.util.Map; import javax.annotation.Resource; import javax.transaction.Transactional; -import com.xboe.api.ThirdApi; import com.xboe.school.study.entity.StudyCourse; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -163,12 +163,11 @@ public class StudyServiceImpl implements IStudyService{ @Override public PageList findItemPage(int pageIndex, int pageSize, String contentId, String courseId,String name,Integer status) { - - QueryBuilder query=QueryBuilder.from(StudyCourseItem.class); - + QueryBuilder query = QueryBuilder.from(StudyCourse.class); + query.setPageIndex(pageIndex); query.setPageSize(pageSize); - + OrderCondition oc=OrderCondition.desc("id"); query.addOrder(oc); if(StringUtils.isNotBlank(contentId)) { @@ -177,18 +176,32 @@ public class StudyServiceImpl implements IStudyService{ if(StringUtils.isNotBlank(courseId)) { query.addFilter(FieldFilters.eq("courseId",courseId)); } - - if(status!=null) { - if(status==1) { - query.addFilter(FieldFilters.eq("progress", 0)); - }else { - query.addFilter(FieldFilters.eq("progress",100)); - } - - } if(StringUtils.isNotBlank(name)) { query.addFilter(FieldFilters.eq("aname", name)); } + if(status!=null) { + if(status==3) { + query.addFilter(FieldFilters.eq("progress", 1)); + }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){ + StudyCourseItem item = new StudyCourseItem(); + item.setAid(bsc.getAid()); + item.setCourseId(bsc.getCourseId()); + item.setAname(bsc.getAname()); + item.setProgress(Integer.valueOf(String.valueOf(bsc.getProgress()))); + studyCourseItemPageList.add(item); + } + return (PageList) studyCourseItemPageList; + } + } + return scItemDao.findPage(query.builder()); }