会员试用

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CountStudentTrainDataDto.java

@@ -21,6 +21,16 @@ public class CountStudentTrainDataDto {
     //评测次数
     private Integer recordNum;
 
+    private String musicGroupName;
+
+    public String getMusicGroupName() {
+        return musicGroupName;
+    }
+
+    public void setMusicGroupName(String musicGroupName) {
+        this.musicGroupName = musicGroupName;
+    }
+
     public Integer getRecordNum() {
         return recordNum;
     }

mec-biz/src/main/resources/config/mybatis/SysMusicCompareRecordMapper.xml

@@ -255,17 +255,20 @@
 		<result property="phone" column="phone_"/>
 		<result property="totalPlayTime" column="total_play_time_"/>
 		<result property="trainDay" column="train_day_"/>
+		<result property="musicGroupName" column="music_group_name_"/>
 	</resultMap>
 	<select id="queryStudentTrain" resultMap="CountStudentTrainDataDto">
 		SELECT s.user_id_,su.avatar_,su.phone_,su.username_,ROUND(SUM(mcr.play_time_) / 60) total_play_time_,
 			   COUNT(DISTINCT DATE_FORMAT(mcr.create_time_,"%Y-%m-%d")) train_day_,
 			   COUNT(DISTINCT mcr.behavior_id_) train_num_,
-		COUNT(CASE WHEN mcr.feature_ = 'CLOUD_STUDY_EVALUATION' THEN mcr.behavior_id_ ELSE NULL END) record_num_
+		COUNT(CASE WHEN mcr.feature_ = 'CLOUD_STUDY_EVALUATION' THEN mcr.behavior_id_ ELSE NULL END) record_num_,GROUP_CONCAT(DISTINCT mg.name_) music_group_name_
 		FROM teacher t
 				 LEFT JOIN student s ON t.id_ = s.teacher_id_
+				 LEFT JOIN student_registration sr ON sr.user_id_ = s.user_id_
+				 LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
 				 LEFT JOIN sys_user su ON su.id_ = s.user_id_
 				 LEFT JOIN sys_music_compare_record mcr ON mcr.user_id_ = s.user_id_
-		WHERE s.teacher_id_ = #{teacherId}
+		WHERE s.teacher_id_ = #{teacherId} AND sr.music_group_status_ = 'NORMAL' AND mg.status_ = 'PROGRESS'
 		<if test="startTime != null and startTime != ''">
 			AND (mcr.create_time_ BETWEEN #{startTime} AND #{endTime} OR mcr.id_ IS NULL)
 		</if>