From dc2d14468281f2d6d5e3bfe7da8bc63b1b050b35 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Mon, 22 Jul 2024 17:38:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/service/impl/StudyServiceImpl.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 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 ef541afb..24752520 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 @@ -182,11 +182,21 @@ public class StudyServiceImpl implements IStudyService{ } if(status!=null) { if(status==3) { - query.addFilter(FieldFilters.eq("progress", 1)); + query.addFilter(FieldFilters.eq("status", 2)); }else if(status==2){ - query.addFilter(FieldFilters.eq("progress",100)); - }else if(status == 1){ - query.addFilter(FieldFilters.eq("progress",0)); + query.addFilter(FieldFilters.eq("status",9)); + }else if (status == 1) { + query.addFilter(FieldFilters.ne("status", 2)); + query.addFilter(FieldFilters.ne("status", 9)); + List list = scItemDao.findList(query.builder()); + List item = new ArrayList<>(list.size()); + for (StudyCourseItem sc : list) { + sc.setProgress(0); + sc.setStatus(1); + item.add(sc); + } + PageList pageList = new PageList<>(item); // 假设 PageList 有一个接受 List 的构造函数 + return pageList; } } From b2981cff8a449197f8dbe684505725ee67057a02 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 23 Jul 2024 08:46:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/service/impl/StudyServiceImpl.java | 15 ++++++++++----- .../service/impl/StudySignupServiceImpl.java | 2 +- 2 files changed, 11 insertions(+), 6 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 24752520..8a9e234b 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 @@ -190,12 +190,17 @@ public class StudyServiceImpl implements IStudyService{ query.addFilter(FieldFilters.ne("status", 9)); List list = scItemDao.findList(query.builder()); List item = new ArrayList<>(list.size()); - for (StudyCourseItem sc : list) { - sc.setProgress(0); - sc.setStatus(1); - item.add(sc); + if (list.isEmpty()){ + for (StudyCourseItem sc : list) { + sc.setProgress(0); + sc.setStatus(1); + sc.setAname(name); + item.add(sc); + } + PageList pageList = new PageList<>(item); + return pageList; } - PageList pageList = new PageList<>(item); // 假设 PageList 有一个接受 List 的构造函数 + PageList pageList = new PageList<>(item); return pageList; } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java index d9345ba2..8d0fe70b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java @@ -168,7 +168,7 @@ public class StudySignupServiceImpl implements IStudySignupService{ //用于管理员添加报名 for(StudySignup ss : list) { addSignup(ss); - addStudyCourseItem(ss); +// addStudyCourseItem(ss); } }