Merge remote-tracking branch 'origin/dev-tmp1' into dev-tmp1

dev-tmp1
luotaiqian 2026-08-25 14:40:10 +08:00
commit 9c7fe1ae3a
1 changed files with 13 additions and 11 deletions

View File

@ -60,17 +60,19 @@ public class CourseManagementServiceImpl extends ServiceImpl<CourseManagementMap
.orderByDesc(CourseManagementDO::getCreateTime) .orderByDesc(CourseManagementDO::getCreateTime)
.page(new Page<>(query.getCurrent(), query.getSize())); .page(new Page<>(query.getCurrent(), query.getSize()));
IPage<CourseManagementVO> convert = page.convert(courseManagementConvertor::convertEToVo); IPage<CourseManagementVO> convert = page.convert(courseManagementConvertor::convertEToVo);
Map<Long, Integer> collectMap = classCourseMapper.selectList(new LambdaQueryWrapper<ClassCourseDO>() if (convert.getRecords() != null && convert.getRecords().size() > 0) {
.in(ClassCourseDO::getCourseId, convert.getRecords().stream().map(CourseManagementVO::getId).collect(Collectors.toList()))) Map<Long, Integer> collectMap = classCourseMapper.selectList(new LambdaQueryWrapper<ClassCourseDO>()
.stream().map(ClassCourseDO::getCourseId).distinct().collect(Collectors.toMap(v -> v, v -> 1)); .in(ClassCourseDO::getCourseId, convert.getRecords().stream().map(CourseManagementVO::getId).collect(Collectors.toList())))
convert.getRecords().forEach(vo -> { .stream().map(ClassCourseDO::getCourseId).distinct().collect(Collectors.toMap(v -> v, v -> 1));
vo.setCourseRelCoursewareVOList(courseRelCoursewareConvertor.convertEListToVoList( convert.getRecords().forEach(vo -> {
courseRelCoursewareMapper.selectList(new LambdaQueryWrapper<CourseRelCoursewareDO>() vo.setCourseRelCoursewareVOList(courseRelCoursewareConvertor.convertEListToVoList(
.eq(CourseRelCoursewareDO::getCourseId, vo.getId()) courseRelCoursewareMapper.selectList(new LambdaQueryWrapper<CourseRelCoursewareDO>()
.orderByAsc(CourseRelCoursewareDO::getSort)) .eq(CourseRelCoursewareDO::getCourseId, vo.getId())
)); .orderByAsc(CourseRelCoursewareDO::getSort))
vo.setUsed(Math.toIntExact(collectMap.getOrDefault(Long.valueOf(vo.getId()), 0))); ));
}); vo.setUsed(Math.toIntExact(collectMap.getOrDefault(Long.valueOf(vo.getId()), 0)));
});
}
return convert; return convert;
} }