|
@@ -174,7 +174,7 @@
|
|
COUNT(DISTINCT DATE(smcr.create_time_)) trainDays,
|
|
COUNT(DISTINCT DATE(smcr.create_time_)) trainDays,
|
|
SUM(smcr.play_time_) trainTime
|
|
SUM(smcr.play_time_) trainTime
|
|
FROM sys_music_compare_record smcr
|
|
FROM sys_music_compare_record smcr
|
|
- WHERE smcr.user_id_=#{userId}
|
|
|
|
|
|
+ WHERE smcr.user_id_=#{userId} and smcr.client_id_ = 'student'
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="getUserTrainChartData" resultType="com.yonge.cooleshow.biz.dal.dto.StudentTrainChartDto">
|
|
<select id="getUserTrainChartData" resultType="com.yonge.cooleshow.biz.dal.dto.StudentTrainChartDto">
|
|
@@ -183,7 +183,7 @@
|
|
COUNT(DISTINCT smcr.behavior_id_) trainNum,
|
|
COUNT(DISTINCT smcr.behavior_id_) trainNum,
|
|
SUM(smcr.play_time_) trainTime
|
|
SUM(smcr.play_time_) trainTime
|
|
FROM sys_music_compare_record smcr
|
|
FROM sys_music_compare_record smcr
|
|
- WHERE smcr.user_id_=#{userId}
|
|
|
|
|
|
+ WHERE smcr.user_id_=#{userId} and smcr.client_id_ = 'student'
|
|
AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
|
|
AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
|
|
GROUP BY DATE_FORMAT(smcr.create_time_, '%Y-%m-%d')
|
|
GROUP BY DATE_FORMAT(smcr.create_time_, '%Y-%m-%d')
|
|
ORDER BY trainDate;
|
|
ORDER BY trainDate;
|
|
@@ -293,7 +293,7 @@
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="getUserLastEvaluationData" resultMap="SysMusicCompareRecord">
|
|
<select id="getUserLastEvaluationData" resultMap="SysMusicCompareRecord">
|
|
- SELECT * FROM sys_music_compare_record WHERE user_id_=#{userId} AND feature_ = 'CLOUD_STUDY_EVALUATION' ORDER BY create_time_ DESC LIMIT 1
|
|
|
|
|
|
+ SELECT * FROM sys_music_compare_record WHERE user_id_=#{userId} AND feature_ = 'CLOUD_STUDY_EVALUATION' and client_id_ = 'student' ORDER BY create_time_ DESC LIMIT 1
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="getUserWeekMaxMusicScoreId" resultType="java.lang.Integer">
|
|
<select id="getUserWeekMaxMusicScoreId" resultType="java.lang.Integer">
|