hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-15 13:56:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy0716-llf' into dev0525

Browse Source
This commit is contained in:
nisen
2024-07-23 08:51:09 +08:00
parent 5d31baa027 b2981cff8a
commit 7887736fb2
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
View File

@@ -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<StudyCourseItem> list = scItemDao.findList(query.builder());
List<StudyCourseItem> 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<StudyCourseItem> pageList = new PageList<>(item);
return pageList;
}
PageList<StudyCourseItem> pageList = new PageList<>(item);
return pageList;
}
}

2
servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java
View File

@@ -168,7 +168,7 @@ public class StudySignupServiceImpl implements IStudySignupService{
//用于管理员添加报名
for(StudySignup ss : list) {
addSignup(ss);
addStudyCourseItem(ss);
// addStudyCourseItem(ss);
}
}