Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExtracurricularExercisesMessageServiceImpl.java

@@ -66,7 +66,7 @@ public class ExtracurricularExercisesMessageServiceImpl extends BaseServiceImpl<
 		if("TEACHER".equals(extracurricularExercisesMessage.getRole())){
 			if(Objects.nonNull(extracurricularExercisesReply.getAttachments())){
 				boolean change=false;
-				if(extracurricularExercisesReply.getIsRepliedTimely()!=Integer.valueOf(1)&&Objects.nonNull(extracurricularExercisesReply.getSubmitTime())){
+				if(!Integer.valueOf(1).equals(extracurricularExercisesReply.getIsRepliedTimely())&&Objects.nonNull(extracurricularExercisesReply.getSubmitTime())){
 					int hours = DateUtil.hoursBetween(extracurricularExercisesReply.getSubmitTime(), new Date());
 					if(hours>=0&&hours<=12){
 						extracurricularExercisesReply.setIsRepliedTimely(1);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseHomeworkServiceImpl.java

@@ -157,7 +157,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         if(Objects.nonNull(byStudentAndCourseHomewok.getSubmitTime())){
             hours = DateUtil.hoursBetween(byStudentAndCourseHomewok.getSubmitTime(), new Date());
         }
-        if (byStudentAndCourseHomewok.getIsReplied() == YesOrNoEnum.YES && byStudentAndCourseHomewok.getIsRepliedTimely() == Integer.valueOf(1)) {
+        if (byStudentAndCourseHomewok.getIsReplied() == YesOrNoEnum.YES && Integer.valueOf(1).equals(byStudentAndCourseHomewok.getIsRepliedTimely())) {
             return true;
         }
         if(hours>=0&&hours<=12){

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

@@ -313,10 +313,11 @@
 		SELECT
 			cssp.user_id_,
 			CONCAT(cs.class_date_, ' ', cs.start_class_time_) start_class_time_,
-			cs.actual_teacher_id_
+			pg.user_id_ actual_teacher_id_
 		FROM
 			course_schedule_student_payment cssp
 			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
+			LEFT JOIN practice_group pg ON cssp.music_group_id_=pg.id_
 			LEFT JOIN student s ON cssp.user_id_=s.user_id_
 		WHERE
 			cssp.group_type_ = 'PRACTICE'