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

Merge remote-tracking branch 'yx/zcwy0716-llf' into dev0525

Browse Source
This commit is contained in:
nisen
2024-07-17 09:03:30 +08:00
parent 262463bb7f df91242e1b
commit 529fb59167
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,5 +94,5 @@ public interface IStudyService {
* @param status * @param status
* @return * @return
*/ */
PageList<StudyCourseItem> findItemPage(int pageIndex,int pageSize,String contentId,String courseId,String name,Integer status); PageList<StudyCourseItem> findItemPage(int pageIndex, int pageSize, String contentId, String courseId, String name, Integer status);
} }

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

@@ -1,6 +1,7 @@
package com.xboe.school.study.service.impl; package com.xboe.school.study.service.impl;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -8,7 +9,6 @@ import java.util.Map;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.transaction.Transactional; import javax.transaction.Transactional;
import com.xboe.api.ThirdApi;
import com.xboe.school.study.entity.StudyCourse; import com.xboe.school.study.entity.StudyCourse;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -163,8 +163,7 @@ public class StudyServiceImpl implements IStudyService{
@Override @Override
public PageList<StudyCourseItem> findItemPage(int pageIndex, int pageSize, String contentId, String courseId,String name,Integer status) { public PageList<StudyCourseItem> findItemPage(int pageIndex, int pageSize, String contentId, String courseId,String name,Integer status) {
QueryBuilder query = QueryBuilder.from(StudyCourse.class);
QueryBuilder query=QueryBuilder.from(StudyCourseItem.class);
query.setPageIndex(pageIndex); query.setPageIndex(pageIndex);
query.setPageSize(pageSize); query.setPageSize(pageSize);
@@ -177,18 +176,32 @@ public class StudyServiceImpl implements IStudyService{
if(StringUtils.isNotBlank(courseId)) { if(StringUtils.isNotBlank(courseId)) {
query.addFilter(FieldFilters.eq("courseId",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)) { if(StringUtils.isNotBlank(name)) {
query.addFilter(FieldFilters.eq("aname", 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<StudyCourse> courses = scDao.findList(query.builder()); // 假设这是你的查询方法
List<StudyCourseItem> 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<StudyCourseItem>) studyCourseItemPageList;
}
}
return scItemDao.findPage(query.builder()); return scItemDao.findPage(query.builder());
} }