|
@@ -405,6 +405,8 @@ public class HomeServiceImpl implements HomeService {
|
|
|
if(Objects.nonNull(practiceSummary)
|
|
|
&& practiceSummary.getPracticeCount().compareTo(BigDecimal.ZERO) > 0
|
|
|
&& practiceSummary.getTotalPracticeTime().compareTo(BigDecimal.ZERO) > 0){
|
|
|
+ //舍掉小数
|
|
|
+ practiceSummary.setTotalPracticeTime(practiceSummary.getTotalPracticeTime().setScale(0, RoundingMode.DOWN));
|
|
|
practiceSummary.setAveragePracticeTime(practiceSummary.getTotalPracticeTime()
|
|
|
.divide(practiceSummary.getPracticeCount(), 0, RoundingMode.DOWN));
|
|
|
}
|
|
@@ -554,9 +556,11 @@ public class HomeServiceImpl implements HomeService {
|
|
|
List<TeacherIndexWrapper.CourseExposureTotal> liveSummer = userOrderDetailService.getDao().liveBuyTotal(search,groupBy);
|
|
|
result.put("COURSE",exposureFillData(liveSummer,dateList));
|
|
|
|
|
|
- //曲谱
|
|
|
- List<TeacherIndexWrapper.CourseExposureTotal> musicSheetSummer = userOrderDetailService.getDao().musicSheetBuyTotal(search,groupBy);
|
|
|
- result.put(GoodTypeEnum.MUSIC.getCode(),exposureFillData(musicSheetSummer,dateList));
|
|
|
+ if(StringUtils.isEmpty(search.getType()) || StringUtils.equals(search.getType(),GoodTypeEnum.MUSIC.getCode())){
|
|
|
+ //曲谱
|
|
|
+ List<TeacherIndexWrapper.CourseExposureTotal> musicSheetSummer = userOrderDetailService.getDao().musicSheetBuyTotal(search,groupBy);
|
|
|
+ result.put(GoodTypeEnum.MUSIC.getCode(),exposureFillData(musicSheetSummer,dateList));
|
|
|
+ }
|
|
|
//将数据合并,map中所有的数据按时间,将list中的数据相加
|
|
|
List<TeacherIndexWrapper.CourseExposureTotal> finalResult = new ArrayList<>();
|
|
|
for (String s : dateList) {
|