|
@@ -345,6 +345,12 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
|
|
|
MapUtil.populateMap(params, queryInfo);
|
|
|
Integer visitFlag = 0;
|
|
|
if(queryInfo.getVisitFlag() != null && queryInfo.getVisitFlag()){
|
|
|
+ //获取乐团在读,有vip网管课的学员列表
|
|
|
+ List<Integer> hasCourseUserIds = studentDao.getStudentByHasCourse(queryInfo.getTeacherId());
|
|
|
+ if(hasCourseUserIds == null || hasCourseUserIds.size() == 0){
|
|
|
+ return pageInfo;
|
|
|
+ }
|
|
|
+ params.put("hasCourseUserIds",hasCourseUserIds);
|
|
|
//获取所选时间段下一周的日期
|
|
|
Date addDays1 = DateUtil.addDays(DateUtil.toDate(queryInfo.getEndTime()), 1);
|
|
|
Date addDays3 = DateUtil.addDays(DateUtil.toDate(queryInfo.getEndTime()), 5);
|
|
@@ -361,6 +367,16 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
|
|
|
}
|
|
|
params.put("having",1);
|
|
|
}
|
|
|
+ String totalTime = sysConfigDao.findConfigValue(SysConfigService.STUDENT_CLOUD_TEACHER_TOTAL_PLAY_TIME);
|
|
|
+ if(StringUtils.isEmpty(totalTime)){
|
|
|
+ totalTime = "80";
|
|
|
+ }
|
|
|
+ params.put("totalTime",Integer.parseInt(totalTime));
|
|
|
+ String trainNum = sysConfigDao.findConfigValue(SysConfigService.STUDENT_CLOUD_TEACHER_TRAIN_NUM);
|
|
|
+ if(StringUtils.isEmpty(trainNum)){
|
|
|
+ trainNum = "4";
|
|
|
+ }
|
|
|
+ params.put("trainNum",Integer.parseInt(trainNum));
|
|
|
int count = sysMusicCompareRecordDao.queryStudentTrain(params).size();
|
|
|
List<CountStudentTrainDataDto> dataList = new ArrayList<>();
|
|
|
if(count > 0){
|