Merge remote-tracking branch 'origin/master'

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

@@ -3394,7 +3394,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         List<CourseScheduleEvaluate> reports = courseScheduleEvaluateDao.findExpiredDateBeforeReport(expiredDate);
 
         for (CourseScheduleEvaluate report : reports) {
-            PracticeGroup userFreePracticeGroup = practiceGroupDao.get(report.getId());
+            PracticeGroup userFreePracticeGroup = practiceGroupDao.get(Long.valueOf(report.getMusicGroupId()));
             ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(userFreePracticeGroup.getId().toString(), GroupType.PRACTICE.getCode());
 
             CourseScheduleEvaluate courseScheduleEvaluate = courseScheduleEvaluateDao.findByClassGroupId(classGroup.getId());

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

@@ -1105,7 +1105,7 @@
     <update id="updateCourseSchoolByGroup">
         UPDATE course_schedule cs SET cs.schoole_id_ = #{schoolId},update_time_ = NOW()
         WHERE cs.music_group_id_ = #{groupId}
-        AND cs.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} AND NOW() &lt; CONCAT(cs.class_date_," ",cs.start_class_time_);
+        AND cs.group_type_ = #{groupType} AND NOW() &lt; CONCAT(cs.class_date_," ",cs.start_class_time_);
     </update>
 
     <update id="updateGroupCourseLock">

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

@@ -495,7 +495,7 @@
 		<result property="signInStatus" column="signInStatus"/>
 		<result property="teacherRole" column="teacherRole"/>
 		<result property="classDate" column="classDate"/>
-		<result property="teachMode" column="teachMode"/>
+		<result property="teachMode" column="teach_mode_"/>
 		<result property="courseScheduleId" column="courseScheduleId"/>
 		<result property="jobType" column="jobType"/>
 		<result property="address" column="address"/>
@@ -511,7 +511,7 @@
 		<result property="offlineClassesUnitPrice" column="offline_classes_unit_price_"/>
  	</resultMap>
     <select id="exportMusicTeacherSalary" resultMap="ExportTeacherSalaryDtoMap">
-		SELECT cs.`id_` courseScheduleId,u.id_ teacherId,mgo.name_ courseOrganName,mg.name_ groupName,
+		SELECT cs.`id_` courseScheduleId,u.id_ teacherId,mgo.name_ courseScheduleOrganName,mg.name_ groupName,
 		ct.name_ changeType,u.real_name_ teacherName,o.name_ teacherOrganName,
 		CASE WHEN cs.teach_mode_ = 'OFFLINE' THEN '线下' WHEN cs.teach_mode_ = 'ONLINE' THEN '线上' END teach_mode_,
 		CASE WHEN t.job_nature_ = 'PART_TIME' THEN '兼职' WHEN t.job_nature_ = 'FULL_TIME' THEN '全职' ELSE '零时工' END jobType,