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..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 @@ -182,11 +182,26 @@ 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()); + 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); + 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); } }