mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-16 22:36:50 +08:00
fix:【FCJDFDXTXS-136】修改考试的查询状态,考试通过-2,考试未通过-4
This commit is contained in:
@@ -1242,7 +1242,7 @@ public class StudyCourseApi extends ApiBaseController{
|
||||
* @param courseId 课程id
|
||||
* @param contentId 内容id
|
||||
* @param name 用户名称
|
||||
* @param status 用户学习状态(1-未开始,2-已完成,3-进行中)
|
||||
* @param status 考试状态(2-考试已通过,4-考试未通过)
|
||||
* @return 资源学习情况分页集合
|
||||
*/
|
||||
@RequestMapping(value = "/contents-exam", method = {RequestMethod.GET, RequestMethod.POST})
|
||||
@@ -1257,7 +1257,6 @@ public class StudyCourseApi extends ApiBaseController{
|
||||
if (studyExams == null || studyExams.isEmpty()) {
|
||||
return success(new PageList<>());
|
||||
}
|
||||
List<String> studyCourseItemIds = studyExams.stream().map(StudyExam::getStudyItemId).collect(Collectors.toList());
|
||||
// 分页查询资源学习信息(只查询有考试信息的部分)
|
||||
PageList<StudyCourseItem> rs = studyService.findItemPage(pager.getPageIndex(), pager.getPageSize(), null, contentId, courseId, name, status);
|
||||
// 拼接考试信息
|
||||
|
||||
@@ -284,6 +284,10 @@ public class StudyServiceImpl implements IStudyService{
|
||||
// 未开始(结合现有数据,这里筛选状态为1及为null的数据)
|
||||
query.addFilter(FieldFilters.or(FieldFilters.eq("status", 1), FieldFilters.isNull("status")));
|
||||
return scItemDao.findPage(query.builder());
|
||||
} else if (status == 4) {
|
||||
// 25.12.16修改,添加筛选已完成数据之外的情况
|
||||
query.addFilter(FieldFilters.ne("status", 9));
|
||||
return scItemDao.findPage(query.builder());
|
||||
}
|
||||
}
|
||||
// 未传输status的情况,查询所有资源学习情况数据
|
||||
|
||||
Reference in New Issue
Block a user