Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into feature/0721-tenant

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/StudentTrainOverviewDto.java

@@ -1,11 +1,13 @@
 package com.yonge.cooleshow.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @Author Joburgess
  * @Date 2021/8/11 0011
  */
+@Data
 public class StudentTrainOverviewDto {
 
     @ApiModelProperty("训练天数")
@@ -14,30 +16,9 @@ public class StudentTrainOverviewDto {
     @ApiModelProperty("训练时长")
     private int trainTime = 0;
 
+    @ApiModelProperty("平均训练时长")
+    private int avgTrainTime = 0;
+
     @ApiModelProperty("训练次数")
     private int trainNum = 0;
-
-    public int getTrainDays() {
-        return trainDays;
-    }
-
-    public void setTrainDays(int trainDays) {
-        this.trainDays = trainDays;
-    }
-
-    public int getTrainTime() {
-        return trainTime;
-    }
-
-    public void setTrainTime(int trainTime) {
-        this.trainTime = trainTime;
-    }
-
-    public int getTrainNum() {
-        return trainNum;
-    }
-
-    public void setTrainNum(int trainNum) {
-        this.trainNum = trainNum;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMusicCompareRecordServiceImpl.java

@@ -310,7 +310,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 																				queryInfo.getEndTime(),queryInfo.getClientId());
 		}
 
-		if(CollectionUtils.isEmpty(userTrainChartData)||userTrainChartData.size()!=7){
+		if(CollectionUtils.isEmpty(userTrainChartData) || userTrainChartData.size() < 7){
 			Set<LocalDate> trainDates = userTrainChartData.stream().map(StudentTrainChartDto::getTrainDate).collect(Collectors.toSet());
 			LocalDate startLocalDate = LocalDate.parse(queryInfo.getStartTime(), DateUtil.dateFormatter);
 			for (int i = 1; i <= 7; i++) {
@@ -340,6 +340,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());
 		result.put("userTrainOverView",userTrainOverView);
 
 		List<IndexBaseDto> userTrainChartResult = new ArrayList<>();