update

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysMusicCompareRecordDao.java

@@ -13,60 +13,58 @@ import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysMusicCompareRecordDao extends BaseDAO<Long, SysMusicCompareRecord> {
 
-    /**
-     * @describe 获取用户最后一次评测数据
-     * @author Joburgess
-     * @date 2021/8/23 0023
-     * @param userId:
-     * @return com.ym.mec.biz.dal.entity.SysMusicCompareRecord
-     */
-    SysMusicCompareRecord getUserLastEvaluationData(@Param("userId") Long userId);
+	/**
+	 * @describe 获取用户最后一次评测数据
+	 * @author Joburgess
+	 * @date 2021/8/23 0023
+	 * @param userId:
+	 * @return com.ym.mec.biz.dal.entity.SysMusicCompareRecord
+	 */
+	SysMusicCompareRecord getUserLastEvaluationData(@Param("userId") Long userId);
 
-    /**
-     * @describe 获取用户训练总览
-     * @author Joburgess
-     * @date 2021/8/11 0011
-     * @param userId:
-     * @return com.ym.mec.biz.dal.dto.StudentTrainOverviewDto
-     */
-    StudentTrainOverviewDto getUserTrainOverView(@Param("userId") Long userId);
+	/**
+	 * @describe 获取用户训练总览
+	 * @author Joburgess
+	 * @date 2021/8/11 0011
+	 * @param userId:
+	 * @return com.ym.mec.biz.dal.dto.StudentTrainOverviewDto
+	 */
+	StudentTrainOverviewDto getUserTrainOverView(@Param("userId") Long userId);
 
-    /**
-     * @describe 获取用户训练图表数据
-     * @author Joburgess
-     * @date 2021/8/12 0012
-     * @param userId:
-     * @param startTime:
-     * @param endTime:
-     * @return java.util.List<com.ym.mec.biz.dal.dto.StudentTrainChartDto>
-     */
-    List<StudentTrainChartDto> getUserTrainChartData(@Param("userId") Long userId,
-                                                     @Param("startTime") String startTime,
-                                                     @Param("endTime") String endTime);
+	/**
+	 * @describe 获取用户训练图表数据
+	 * @author Joburgess
+	 * @date 2021/8/12 0012
+	 * @param userId:
+	 * @param startTime:
+	 * @param endTime:
+	 * @return java.util.List<com.ym.mec.biz.dal.dto.StudentTrainChartDto>
+	 */
+	List<StudentTrainChartDto> getUserTrainChartData(@Param("userId") Long userId, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    int countMusicGroupStudentTrainData(Map<String, Object> params);
+	int countMusicGroupStudentTrainData(Map<String, Object> params);
 
-    /**
-     * @describe 统计分部云教练新增人数
-     * @author Joburgess
-     * @date 2021/8/18 0018
-     * @param organId:
-     * @return int
-     */
-    int getOrganNewCloudStudyNum(@Param("organId") Integer organId);
-    int getOrgansTotalNewCloudStudyNum(@Param("organIds") List<Integer> organIds);
-    List<Map<Integer, Integer>> getOrgansNewCloudStudyNum(@Param("organIds") List<Integer> organIds);
+	/**
+	 * @describe 统计分部云教练新增人数
+	 * @author Joburgess
+	 * @date 2021/8/18 0018
+	 * @param organId:
+	 * @return int
+	 */
+	int getOrganNewCloudStudyNum(@Param("organId") Integer organId);
 
-    /**
-     * @describe 获取用户本周最高分对应曲目编号
-     * @author Joburgess
-     * @date 2021/8/30 0030
-     * @param userId:
-     * @param monday:
-     * @param heardLevel:
-     * @return java.lang.Integer
-     */
-    Integer getUserWeekMaxMusicScoreId(@Param("userId") Long userId,
-                                       @Param("monday") String monday,
-                                        @Param("heardLevel") HeardLevelEnum heardLevel);
+	int getOrgansTotalNewCloudStudyNum(@Param("organIds") List<Integer> organIds);
+
+	List<Map<Integer, Integer>> getOrgansNewCloudStudyNum(@Param("organIds") List<Integer> organIds);
+
+	/**
+	 * @describe 获取用户本周最高分对应曲目编号
+	 * @author Joburgess
+	 * @date 2021/8/30 0030
+	 * @param userId:
+	 * @param monday:
+	 * @param heardLevel:
+	 * @return java.lang.Integer
+	 */
+	Integer getUserWeekMaxMusicScoreId(@Param("userId") Long userId, @Param("monday") String monday, @Param("heardLevel") HeardLevelEnum heardLevel);
 }

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

@@ -161,26 +161,6 @@
 		<include refid="queryCondition"/>
 	</select>
 
-    <select id="getUserTrainStat" resultType="com.yonge.cooleshow.biz.dal.dto.MusicCompareRankingDto">
-		SELECT
-			smcr.user_id_ userId,
-			su.avatar_ avatar,
-		    su.username_ studentName,
-		    sms.name_ musicScoreName,
-			COUNT(smcr.id_) trainNum,
-		    MAX(smcr.score_) score,
-			COUNT(DISTINCT DATE(smcr.create_time_)) trainDays,
-			SUM(smcr.play_time_) trainTime
-		FROM sys_music_compare_record smcr
-			LEFT JOIN sys_user su ON smcr.user_id_=su.id_
-			LEFT JOIN sys_music_score sms ON smcr.music_sheet_id_ = sms.id_
-		WHERE EXISTS (SELECT user_id_ FROM student WHERE user_id_=smcr.user_id_)
-		AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
-		<if test="heardLevel!=null">
-			AND smcr.heard_level_ = #{heardLevel, typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}
-		</if>
-		GROUP BY smcr.user_id_
-	</select>
 
 	<select id="getUserTrainOverView" resultType="com.yonge.cooleshow.biz.dal.dto.StudentTrainOverviewDto">
 		SELECT
@@ -218,36 +198,6 @@
 		</where>
 	</sql>
 
-	<select id="queryMusicGroupStudentTrainData" resultType="com.yonge.cooleshow.biz.dal.dto.MusicCompareRankingDto">
-		SELECT
-			smcr.user_id_ userId,
-			su.avatar_ avatar,
-			su.username_ studentName,
-			COUNT( smcr.id_ ) trainNum,
-			COUNT( DISTINCT DAY ( smcr.create_time_ )) trainDays,
-			SUM( smcr.play_time_ ) trainTime,
-			CASE WHEN stu.member_rank_setting_id_ IS NULL THEN 0 ELSE 1 END vipUser
-		FROM
-			sys_music_compare_record smcr
-				LEFT JOIN sys_user su ON smcr.user_id_ = su.id_
-				LEFT JOIN student stu ON stu.user_id_ = smcr.user_id_
-				LEFT JOIN student_registration sr ON sr.user_id_=smcr.user_id_
-		<include refid="queryMusicGroupStudentTrainDataConditon"></include>
-		GROUP BY smcr.user_id_
-		<if test="sortField!=null and sortField!=''">
-			<if test="sortField == 'TRAINDAYS'">
-				ORDER BY trainDays
-			</if>
-			<if test="sortField == 'TRAINTIME'">
-				ORDER BY trainTime
-			</if>
-			<if test="sortField == 'TRAINNUM'">
-				ORDER BY trainNum
-			</if>
-		</if>
-		<include refid="global.limit"></include>
-	</select>
-
 	<select id="countMusicGroupStudentTrainData" resultType="int">
 		SELECT
 			COUNT(DISTINCT smcr.user_id_)
@@ -259,17 +209,6 @@
 		<include refid="queryMusicGroupStudentTrainDataConditon"/>
 	</select>
 
-	<select id="queryStudentTrainData" resultType="com.yonge.cooleshow.biz.dal.dto.EduOrganStudentListDto">
-		SELECT
-			user_id_ studentId,
-			COUNT(DISTINCT behavior_id_) cloudStudyUseNum,
-			SUM(play_time_) cloudStudyUseTime
-		FROM
-			sys_music_compare_record
-		GROUP BY
-			user_id_
-	</select>
-
 	<select id="getOrganNewCloudStudyNum" resultType="int">
 		SELECT
 			COUNT( DISTINCT user_id_ )
@@ -351,18 +290,6 @@
 		SELECT * FROM sys_music_compare_record WHERE user_id_=#{userId} AND feature_ = 'CLOUD_STUDY_EVALUATION' ORDER BY create_time_ DESC LIMIT 1
 	</select>
 
-	<select id="getUserWeekCompareData" resultType="com.yonge.cooleshow.biz.dal.entity.SysMusicCompareWeekData">
-		SELECT
-			COUNT(smcr.id_) trainNum,
-			COUNT(DISTINCT DATE(smcr.create_time_)) trainDays,
-			SUM(smcr.play_time_) trainTime,
-			MAX(IF(heard_level_='BEGINNER' AND source_time_ &gt;= play_time_, smcr.score_, 0)) beginnerMaxScore,
-			MAX(IF(heard_level_='ADVANCED' AND source_time_ &gt;= play_time_, smcr.score_, 0)) advancedMaxScore,
-			MAX(IF(heard_level_='PERFORMER' AND source_time_ &gt;= play_time_, smcr.score_, 0)) performerMaxScore,smcr.tenant_id_ tenantId
-		FROM sys_music_compare_record smcr
-		WHERE user_id_=#{userId} AND monday_ = #{monday}
-	</select>
-
 	<select id="getUserWeekMaxMusicScoreId" resultType="java.lang.Integer">
 		SELECT music_sheet_id_ FROM sys_music_compare_record
 		WHERE user_id_=#{userId} AND monday_ = #{monday} AND heard_level_ = #{heardLevel, typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}