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

fix: 【FCJDFDXTXS-145】先不采用此方案

Browse Source
This commit is contained in:
liu.zixi
2025-12-16 20:38:56 +08:00
parent 5c1e6c3253
commit c5889fdd7d
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
View File

@@ -1226,16 +1226,16 @@ public class StudyCourseApi extends ApiBaseController{
return error("无课程信息");
}
try {
// 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);
return success(rs);
}catch(Exception e) {
log.error("【资源学习情况分页查询】错误", e);
@@ -1267,16 +1267,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()) {
@@ -1319,16 +1319,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()) {