查询逻辑修改
This commit is contained in:
parent
d5553dd438
commit
3841c95b56
|
|
@ -128,18 +128,22 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
|
||||||
|
|
||||||
List<Course> courseList = courseIdList.isEmpty() ? new ArrayList<>() : courseDao.selectList(new LambdaQueryWrapper<Course>().in(Course::getCourseId, courseIdList));
|
List<Course> courseList = courseIdList.isEmpty() ? new ArrayList<>() : courseDao.selectList(new LambdaQueryWrapper<Course>().in(Course::getCourseId, courseIdList));
|
||||||
// List<Course> courseList = baseMapper.selectCourseByCollect(userId, classify);
|
// List<Course> courseList = baseMapper.selectCourseByCollect(userId, classify);
|
||||||
Set<Long> detailIdList = courseList.stream().map(Course::getCourseDetailsId).collect(Collectors.toSet());
|
Set<Long> detailIdList = courseCollectList.stream().map(CourseCollect::getCourseDetailsId).collect(Collectors.toSet());
|
||||||
Map<Long, String> courseDetailsMap = detailIdList.isEmpty() ? new HashMap<>() : courseDetailsService.list(new LambdaQueryWrapper<CourseDetails>()
|
Map<Long, CourseDetails> courseDetailsMap = detailIdList.isEmpty() ? new HashMap<>() : courseDetailsService.list(new LambdaQueryWrapper<CourseDetails>()
|
||||||
.in(CourseDetails::getCourseDetailsId, detailIdList)
|
.in(CourseDetails::getCourseDetailsId, detailIdList)).stream()
|
||||||
.select(CourseDetails::getCourseDetailsName)).stream()
|
.collect(Collectors.toMap(CourseDetails::getCourseDetailsId, item->item));
|
||||||
.collect(Collectors.toMap(CourseDetails::getCourseDetailsId, CourseDetails::getCourseDetailsName));
|
|
||||||
PageInfo<Course> pageInfo = new PageInfo<>(courseList);
|
PageInfo<Course> pageInfo = new PageInfo<>(courseList);
|
||||||
if (CollectionUtil.isNotEmpty(courseList)) {
|
if (CollectionUtil.isNotEmpty(courseList)) {
|
||||||
List<Course> courses = pageInfo.getList();
|
List<Course> courses = pageInfo.getList();
|
||||||
for (Course course : courses) {
|
for (Course course : courses) {
|
||||||
course.setCourseClassification(courseClassificationDao.selectById(course.getClassifyId()));
|
course.setCourseClassification(courseClassificationDao.selectById(course.getClassifyId()));
|
||||||
CourseCollect courseCollect = courseCollectHashMap.get(course.getCourseId());
|
CourseCollect courseCollect = courseCollectHashMap.get(course.getCourseId());
|
||||||
course.setCourseDetailsName(courseCollect == null ? null : courseDetailsMap.get(courseCollect.getCourseDetailsId()));
|
CourseDetails courseDetails = courseCollect == null ? null : courseDetailsMap.get(courseCollect.getCourseDetailsId());
|
||||||
|
if (courseDetails != null) {
|
||||||
|
course.setCourseDetailsName(courseDetails.getCourseDetailsName());
|
||||||
|
course.setCourseDetailsId(courseDetails.getCourseDetailsId());
|
||||||
|
course.setCourseDetailsCount(courseDetails.getCourseDetailsCount());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Result.success().put("data", PageUtils.page(pageInfo, true));
|
return Result.success().put("data", PageUtils.page(pageInfo, true));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue