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

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

@@ -604,7 +604,7 @@
 			#{studentId}
 		</foreach>
 		<if test="param.startTime != null and param.startTime != ''">
-			AND mcr.create_time_ BETWEEN #{param.startTime} AND #{param.endTime}
+			AND DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime}
 		</if>
 	</select>
 	<select id="getStudentTrainTime"
@@ -615,7 +615,7 @@
 			#{studentId}
 		</foreach>
 		<if test="param.startTime != null and param.startTime != ''">
-			AND mcr.create_time_ BETWEEN #{param.startTime} AND #{param.endTime}
+			AND DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime}
 		</if>
 		GROUP BY DATE_FORMAT(mcr.create_time_, #{groupBy})
 		ORDER BY 'date'
@@ -628,7 +628,7 @@
 			#{studentId}
 		</foreach>
 		<if test="param.startTime != null and param.startTime != ''">
-			AND mcr.create_time_ BETWEEN #{param.startTime} AND #{param.endTime}
+			AND DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime}
 		</if>
 		GROUP BY DATE_FORMAT(mcr.create_time_, #{groupBy})
 		ORDER BY 'date'
@@ -647,7 +647,7 @@
 			#{studentId}
 		</foreach>
 		<if test="param.startTime != null and param.startTime != ''">
-			AND smcr.create_time_ BETWEEN #{param.startTime} AND #{param.endTime}
+			AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime}
 		</if>
 		GROUP BY smcr.user_id_
 		<if test="param.sortField != null and param.sortField != ''">
@@ -656,6 +656,7 @@
 		<if test="param.sortField == null or param.sortField == ''">
 			ORDER BY totalPracticeTime DESC
 		</if>
+			,smcr.user_id_
 		LIMIT ${param.limit}
 	</select>
 	<!--曲目练习统计-->

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

@@ -414,7 +414,7 @@
         where t.entry_flag_ = 1
           and t.is_test_user_ = 0 AND t.lock_flag_ = 0
           and find_in_set(#{subjectId}, t.subject_id_)
-        order by tft.num desc ,ms.num DESC ,tt.fans_num_ desc
+        order by tft.num desc ,ms.num DESC ,tt.fans_num_ desc,t.user_id_
         limit 10
     </select>