Merge branch 'feature/1219_opt' of http://git.dayaedu.com/yonge/cooleshow into test

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

@@ -495,10 +495,6 @@ public class HomeServiceImpl implements HomeService {
         if(CollectionUtils.isEmpty(studentIds)){
             return Collections.emptyList();
         }
-        //获取间隔天数
-        int days = DateUtil.daysBetween(DateUtil.strToDate(studentSearch.getStartTime(), DateUtil.DEFAULT_PATTERN),
-                DateUtil.strToDate(studentSearch.getEndTime(), DateUtil.DEFAULT_PATTERN)) + 1;
-        studentSearch.setIntervalDays(days);
         //获取学员练习汇总
         List<TeacherIndexWrapper.StudentPracticeSummaryDto> result = sysMusicCompareRecordService.getDao().getStudentTrainOverViewList(studentIds, studentSearch);
         if(Objects.nonNull(result)){

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TeacherIndexWrapper.java

@@ -57,9 +57,6 @@ public class TeacherIndexWrapper {
 
         @ApiModelProperty("查询条数")
         private Integer limit = 10;
-
-        @ApiModelProperty("间隔天数")
-        private Integer intervalDays;
     }
 
     @Data

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysMusicCompareRecordMapper.xml

@@ -637,7 +637,7 @@
 			resultType="com.yonge.cooleshow.biz.dal.wrapper.TeacherIndexWrapper$StudentPracticeSummaryDto">
 		select smcr.user_id_ userId,su.username_ studentName,su.avatar_ avatar,sb.name_ subjectName,SUM(smcr.play_time_) totalPracticeTime,
 		       COUNT(DISTINCT DATE_FORMAT(smcr.create_time_, '%Y-%m-%d')) practiceDays,
-		       SUM(smcr.play_time_) / ${param.intervalDays} averagePracticeTime
+		       SUM(smcr.play_time_) / COUNT(DISTINCT DATE_FORMAT(smcr.create_time_, '%Y-%m-%d')) averagePracticeTime
 		from sys_music_compare_record smcr
 				 left join sys_user su ON su.id_ = smcr.user_id_
 				 left join student st ON st.user_id_ = su.id_

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderDetailMapper.xml

@@ -157,7 +157,7 @@
                DATE_FORMAT(uod.create_time_,#{groupBy}) 'date' from user_order_detail uod
         left join user_order uo ON uo.order_no_ = uod.order_no_
         left join course_group cg On cg.id_ = uod.biz_id_
-        where cg.teacher_id_ = #{param.teacherId} AND uo.status_ = 'PAID' AND cg.status_ != 'CANCEL'
+        where cg.teacher_id_ = #{param.teacherId} AND uo.status_ = 'PAID' AND cg.status_ != 'CANCEL' AND uod.good_type_ != 'TENANT_ALBUM'
         AND DATE_FORMAT(uod.create_time_, '%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime}
         <if test="param.type != null and param.type != ''">
             and uod.good_type_ = #{param.type}
@@ -168,7 +168,7 @@
         DATE_FORMAT(uod.create_time_,#{groupBy}) 'date' from user_order_detail uod
         left join user_order uo ON uo.order_no_ = uod.order_no_
         left join video_lesson_group cg On cg.id_ = uod.biz_id_
-        where cg.teacher_id_ = #{param.teacherId} AND uo.status_ = 'PAID'
+        where cg.teacher_id_ = #{param.teacherId} AND uo.status_ = 'PAID' AND uod.good_type_ != 'TENANT_ALBUM'
         AND DATE_FORMAT(uod.create_time_, '%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime}
         <if test="param.type != null and param.type != ''">
             and uod.good_type_ = #{param.type}