|
@@ -249,7 +249,8 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
|
|
//查询每日训练时长
|
|
//查询每日训练时长
|
|
param.put("startTime", startDateStr + " 00:00:00");
|
|
param.put("startTime", startDateStr + " 00:00:00");
|
|
param.put("endTime", endDateStr + " 23:59:59");
|
|
param.put("endTime", endDateStr + " 23:59:59");
|
|
- List<TempUserTrainingTimeDetailVo> userTrainingTimeList = baseMapper.queryUserTrainingTime(param);
|
|
|
|
|
|
+ param.put("campId", camp.getId());
|
|
|
|
+ List<TempUserTrainingTimeDetailVo> userTrainingTimeList = baseMapper.queryUserTrainingTimeV2(param);
|
|
//拼接数据
|
|
//拼接数据
|
|
if (CollectionUtils.isNotEmpty(userTrainingTimeList)) {
|
|
if (CollectionUtils.isNotEmpty(userTrainingTimeList)) {
|
|
Map<String, BigDecimal> nowTrainingTime = userTrainingTimeList.stream()
|
|
Map<String, BigDecimal> nowTrainingTime = userTrainingTimeList.stream()
|
|
@@ -283,14 +284,14 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
|
|
//训练营详情-查询条件时间设置
|
|
//训练营详情-查询条件时间设置
|
|
queryUserTrainingDetailOpsParam(param);
|
|
queryUserTrainingDetailOpsParam(param);
|
|
Page<TempCampUserTrainingDetailVo> page = PageUtil.getPageInfo(param);
|
|
Page<TempCampUserTrainingDetailVo> page = PageUtil.getPageInfo(param);
|
|
- page.setDesc("b.playDay");
|
|
|
|
- IPage<TempCampUserTrainingDetailVo> vos = baseMapper.queryUserTrainingDetail(page, param);
|
|
|
|
|
|
+ page.setDesc("t.playDay");
|
|
|
|
+ IPage<TempCampUserTrainingDetailVo> vos = baseMapper.queryUserTrainingDetailV2(page, param);
|
|
List<TempCampUserTrainingDetailVo> records = vos.getRecords();
|
|
List<TempCampUserTrainingDetailVo> records = vos.getRecords();
|
|
if(CollectionUtils.isNotEmpty(records)){
|
|
if(CollectionUtils.isNotEmpty(records)){
|
|
List<Integer> studentIds = records.stream().map(e -> e.getId()).collect(Collectors.toList());
|
|
List<Integer> studentIds = records.stream().map(e -> e.getId()).collect(Collectors.toList());
|
|
Map<Integer,String> subjectMap = MapUtil.convertIntegerMap(studentDao.getStudentSubjectMapList(studentIds));
|
|
Map<Integer,String> subjectMap = MapUtil.convertIntegerMap(studentDao.getStudentSubjectMapList(studentIds));
|
|
Map<Integer,String> groupNameMap = MapUtil.convertMybatisMap(musicGroupDao.queryNormalGroupName(studentIds));
|
|
Map<Integer,String> groupNameMap = MapUtil.convertMybatisMap(musicGroupDao.queryNormalGroupName(studentIds));
|
|
- List<TempCampUserTrainingSequenceVo> sequenceDays = studentDao.getStudentCloudStudySequenceDays(studentIds,
|
|
|
|
|
|
+ List<TempCampUserTrainingSequenceVo> sequenceDays = studentDao.getStudentCloudStudySequenceDaysV2(studentIds,
|
|
param.get("startTime").toString(),param.get("endTime").toString());
|
|
param.get("startTime").toString(),param.get("endTime").toString());
|
|
Map<Integer, List<Long>> listMap = sequenceDays.stream().collect(Collectors.groupingBy(e -> e.getUserId(),
|
|
Map<Integer, List<Long>> listMap = sequenceDays.stream().collect(Collectors.groupingBy(e -> e.getUserId(),
|
|
Collectors.collectingAndThen(Collectors.toList(),v->v.stream().map(e->e.getDayNum()).collect(Collectors.toList()))));
|
|
Collectors.collectingAndThen(Collectors.toList(),v->v.stream().map(e->e.getDayNum()).collect(Collectors.toList()))));
|