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

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

@@ -527,7 +527,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
                         null,
                         0,
                         ClientEnum.STUDENT.getCode(),
-                        user.getRealName(),
+                        user.getUsername(),
                         CourseTypeEnum.valueOf(courseGroup.getType()));
             }
         }

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

@@ -287,7 +287,7 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
                         null,
                         0 ,
                         ClientEnum.STUDENT.getCode(),
-                        teacher.getRealName(),
+                        teacher.getUsername(),
                         CourseTypeEnum.valueOf(courseSchedule.getType()).getMsg());
             } catch (Exception e) {
                 log.warn("老师布置作业消息发送失败  学生id：{}",student.getId());
@@ -359,7 +359,7 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
                 null,
                 0 ,
                 ClientEnum.STUDENT.getCode(),
-                teacher.getRealName());
+                teacher.getUsername());
     }
 
     @Override

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

@@ -136,7 +136,7 @@ public class CourseRepliedServiceImpl extends ServiceImpl<CourseScheduleRepliedD
                     null,
                     0,
                     ClientEnum.STUDENT.getCode(),
-                    teacher.getRealName(),
+                    teacher.getUsername(),
                     courseTypeEnum.getMsg());
             log.info("send success {}", MessageTypeEnum.TEACHER_EVALUATE_STUDENT_PRACTICE);
         } catch (Exception e) {

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

@@ -1519,7 +1519,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                     null,
                     0,
                     ClientEnum.STUDENT.getCode(),
-                    teacher.getRealName(),
+                    teacher.getUsername(),
                     oldDateString,
                     CourseTypeEnum.valueOf(courseGroup.getType()).getMsg(),
                     dateString);

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

@@ -608,7 +608,7 @@
 	</select>
 	<select id="getStudentTrainTime"
 			resultType="com.yonge.cooleshow.biz.dal.wrapper.TeacherIndexWrapper$PracticeTimeDto">
-		select SUM(play_time_) practiceTime,DATE_FORMAT(mcr.create_time_, ${groupBy}) 'date' from sys_music_compare_record mcr
+		select SUM(play_time_) practiceTime,DATE_FORMAT(mcr.create_time_, #{groupBy}) 'date' from sys_music_compare_record mcr
 		where mcr.user_id_ IN
 		<foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
 			#{studentId}
@@ -616,12 +616,12 @@
 		<if test="param.startTime != null and param.startTime != ''">
 			AND mcr.create_time_ BETWEEN #{param.startTime} AND #{param.endTime}
 		</if>
-		GROUP BY DATE_FORMAT(mcr.create_time_, ${groupBy})
+		GROUP BY DATE_FORMAT(mcr.create_time_, #{groupBy})
 		ORDER BY 'date'
 	</select>
     <select id="getStudentTrainCount"
             resultType="com.yonge.cooleshow.biz.dal.wrapper.TeacherIndexWrapper$PracticeTimeDto">
-		select COUNT(DISTINCT mcr.user_id_) practiceTime,DATE_FORMAT(mcr.create_time_, ${groupBy}) 'date' from sys_music_compare_record mcr
+		select COUNT(DISTINCT mcr.user_id_) practiceTime,DATE_FORMAT(mcr.create_time_, #{groupBy}) 'date' from sys_music_compare_record mcr
 		where mcr.user_id_ IN
 		<foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
 			#{studentId}
@@ -629,7 +629,7 @@
 		<if test="param.startTime != null and param.startTime != ''">
 			AND mcr.create_time_ BETWEEN #{param.startTime} AND #{param.endTime}
 		</if>
-		GROUP BY DATE_FORMAT(mcr.create_time_, ${groupBy})
+		GROUP BY DATE_FORMAT(mcr.create_time_, #{groupBy})
 		ORDER BY 'date'
 	</select>
 	<select id="getStudentTrainOverViewList"