|
@@ -14,6 +14,7 @@ import com.yonge.cooleshow.biz.dal.dao.VideoLessonAuthRecordDao;
|
|
|
import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDao;
|
|
|
import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDetailDao;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.CourseMusicAlbumRelationDto;
|
|
|
+import com.yonge.cooleshow.biz.dal.dto.Mapper;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.VideoLessonGroupDetailDto;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.search.VideoGroupSearch;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonGroupSearch;
|
|
@@ -115,15 +116,17 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
|
|
|
}
|
|
|
}
|
|
|
List<VideoLessonGroupVo> videoLessonGroupVos = baseMapper.selectPage(page, query);
|
|
|
- //获取直播课关联的曲目数量
|
|
|
- List<Long> videoLessonGroupIds = videoLessonGroupVos.stream().map(VideoLessonGroupVo::getId).collect(Collectors.toList());
|
|
|
- List<Map<Long,Long>> musicNum = this.baseMapper.countMusicAlbum(videoLessonGroupIds);
|
|
|
- Map<Long,Long> map = MapUtil.convertIntegerMap(musicNum);
|
|
|
- for (VideoLessonGroupVo videoLessonGroupVo : videoLessonGroupVos) {
|
|
|
- if (videoLessonGroupVo.getLessonPrice().compareTo(BigDecimal.ZERO) == 0) {
|
|
|
- videoLessonGroupVo.setCountStudent(videoLessonGroupVo.getCountStudent() + videoLessonGroupVo.getVirtualNumber());
|
|
|
+ if(CollectionUtils.isNotEmpty(videoLessonGroupVos)){
|
|
|
+ //获取直播课关联的曲目数量
|
|
|
+ List<Long> videoLessonGroupIds = videoLessonGroupVos.stream().map(VideoLessonGroupVo::getId).collect(Collectors.toList());
|
|
|
+ List<Mapper> musicNum = this.baseMapper.countMusicAlbum(videoLessonGroupIds);
|
|
|
+ Map<Long,Long> map = musicNum.stream().collect(Collectors.toMap(e->Long.parseLong(e.getKey().toString()), e->Long.parseLong(e.getValue().toString())));
|
|
|
+ for (VideoLessonGroupVo videoLessonGroupVo : videoLessonGroupVos) {
|
|
|
+ if (videoLessonGroupVo.getLessonPrice().compareTo(BigDecimal.ZERO) == 0) {
|
|
|
+ videoLessonGroupVo.setCountStudent(videoLessonGroupVo.getCountStudent() + videoLessonGroupVo.getVirtualNumber());
|
|
|
+ }
|
|
|
+ videoLessonGroupVo.setMusicNum(map.get(videoLessonGroupVo.getId()));
|
|
|
}
|
|
|
- videoLessonGroupVo.setMusicNum(map.get(videoLessonGroupVo.getId()));
|
|
|
}
|
|
|
return page.setRecords(videoLessonGroupVos);
|
|
|
}
|