Merge remote-tracking branch 'origin/dev-tmp1' into dev-tmp1
commit
9c7fe1ae3a
|
|
@ -60,6 +60,7 @@ 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);
|
||||||
|
if (convert.getRecords() != null && convert.getRecords().size() > 0) {
|
||||||
Map<Long, Integer> collectMap = classCourseMapper.selectList(new LambdaQueryWrapper<ClassCourseDO>()
|
Map<Long, Integer> collectMap = classCourseMapper.selectList(new LambdaQueryWrapper<ClassCourseDO>()
|
||||||
.in(ClassCourseDO::getCourseId, convert.getRecords().stream().map(CourseManagementVO::getId).collect(Collectors.toList())))
|
.in(ClassCourseDO::getCourseId, convert.getRecords().stream().map(CourseManagementVO::getId).collect(Collectors.toList())))
|
||||||
.stream().map(ClassCourseDO::getCourseId).distinct().collect(Collectors.toMap(v -> v, v -> 1));
|
.stream().map(ClassCourseDO::getCourseId).distinct().collect(Collectors.toMap(v -> v, v -> 1));
|
||||||
|
|
@ -71,6 +72,7 @@ public class CourseManagementServiceImpl extends ServiceImpl<CourseManagementMap
|
||||||
));
|
));
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue