fix: 【FCJDFDXTXS-145】作业、评估

This commit is contained in:
liu.zixi
2025-12-17 17:52:30 +08:00
committed by joshen
parent 6dba906938
commit a3fac42698

View File

@@ -1377,16 +1377,16 @@ public class StudyCourseApi extends ApiBaseController{
return success(new PageList<>());
}
// 分页查询资源学习信息(只查询有考试信息的部分)
PageList<StudyCourseItem> rs = studyService.findItemPage(pager.getPageIndex(), pager.getPageSize(), null, contentId, courseId, name, status,aid);
// // 换方法
// List<String> userIdList;
// if (StringUtils.isNotBlank(aid)) {
// String[] ids = aid.split(",");
// userIdList = Arrays.asList(ids);
// } else {
// userIdList = new ArrayList<>();
// }
// PageList<StudyCourseItem> rs = studyService.itemPage(pager.getPageIndex(), pager.getPageSize(), contentId, courseId, status, userIdList);
// PageList<StudyCourseItem> rs = studyService.findItemPage(pager.getPageIndex(), pager.getPageSize(), null, contentId, courseId, name, status,aid);
// 换方法
List<String> userIdList;
if (StringUtils.isNotBlank(aid)) {
String[] ids = aid.split(",");
userIdList = Arrays.asList(ids);
} else {
userIdList = new ArrayList<>();
}
PageList<StudyCourseItem> rs = studyService.itemPage(pager.getPageIndex(), pager.getPageSize(), contentId, courseId, status, userIdList);
// 拼接考试信息
List<StudyCourseItem> studyCourseItems = rs.getList();
if (studyCourseItems != null && !studyCourseItems.isEmpty() && !studyExams.isEmpty()) {
@@ -1443,16 +1443,16 @@ public class StudyCourseApi extends ApiBaseController{
return success(new PageList<>());
}
// 分页查询资源学习信息(只查询有评估信息的部分)
PageList<StudyCourseItem> rs = studyService.findItemPage(pager.getPageIndex(), pager.getPageSize(), null, contentId, courseId, name, status,aid);
// // 换方法
// List<String> userIdList;
// if (StringUtils.isNotBlank(aid)) {
// String[] ids = aid.split(",");
// userIdList = Arrays.asList(ids);
// } else {
// userIdList = new ArrayList<>();
// }
// PageList<StudyCourseItem> rs = studyService.itemPage(pager.getPageIndex(), pager.getPageSize(), contentId, courseId, status, userIdList);
// PageList<StudyCourseItem> rs = studyService.findItemPage(pager.getPageIndex(), pager.getPageSize(), null, contentId, courseId, name, status,aid);
// 换方法
List<String> userIdList;
if (StringUtils.isNotBlank(aid)) {
String[] ids = aid.split(",");
userIdList = Arrays.asList(ids);
} else {
userIdList = new ArrayList<>();
}
PageList<StudyCourseItem> rs = studyService.itemPage(pager.getPageIndex(), pager.getPageSize(), contentId, courseId, status, userIdList);
// 拼接评估信息
List<StudyCourseItem> studyCourseItems = rs.getList();
if (studyCourseItems != null && !studyCourseItems.isEmpty() && !studyAssesses.isEmpty()) {