|
|
@@ -10,12 +10,22 @@ import com.yonge.cooleshow.biz.dal.dto.IndexBaseDto;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.IndexBaseMonthData;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.StudentTrainChartDto;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.StudentTrainOverviewDto;
|
|
|
-import com.yonge.cooleshow.biz.dal.entity.*;
|
|
|
+import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
|
|
|
+import com.yonge.cooleshow.biz.dal.entity.Student;
|
|
|
+import com.yonge.cooleshow.biz.dal.entity.Subject;
|
|
|
+import com.yonge.cooleshow.biz.dal.entity.SysMusicCompareRecord;
|
|
|
+import com.yonge.cooleshow.biz.dal.entity.Teacher;
|
|
|
import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
|
|
|
import com.yonge.cooleshow.biz.dal.enums.FeatureType;
|
|
|
import com.yonge.cooleshow.biz.dal.enums.IndexDataType;
|
|
|
import com.yonge.cooleshow.biz.dal.queryInfo.SysMusicCompareRecordQueryInfo;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.*;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.MusicCompareRecordStatService;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.StudentService;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.SysConfigService;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.SysMusicCompareRecordService;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.SysMusicCompareWeekDataService;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.TeacherService;
|
|
|
import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
|
|
|
import com.yonge.cooleshow.biz.dal.wrapper.music.MusicCompareWrapper;
|
|
|
import com.yonge.cooleshow.common.constant.SysConfigConstant;
|
|
|
@@ -39,7 +49,15 @@ import java.time.DayOfWeek;
|
|
|
import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.ZoneId;
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Comparator;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
+import java.util.Objects;
|
|
|
+import java.util.Optional;
|
|
|
+import java.util.Set;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
|
@@ -340,7 +358,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
|
|
|
pageInfo.setRows(dataList);
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
userTrainOverView.setTrainTime(userTrainOverView.getTrainTime()/60);
|
|
|
- userTrainOverView.setAvgTrainTime(userTrainOverView.getTrainTime() / userTrainOverView.getTrainDays());
|
|
|
+ userTrainOverView.setAvgTrainTime(userTrainOverView.getTrainTime() / Math.max(userTrainOverView.getTrainDays(), 1));
|
|
|
result.put("userTrainOverView",userTrainOverView);
|
|
|
|
|
|
List<IndexBaseDto> userTrainChartResult = new ArrayList<>();
|
