add 教务端乐团巡查日程管理

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

@@ -3513,12 +3513,13 @@
     </select>
 
     <select id="getMusicGroupCourseInfo" resultMap="CourseSchedule"><![CDATA[
-        SELECT cs.id_, cs.actual_teacher_id_,CONCAT(cg.name_,'-',su.real_name_) name_  FROM course_schedule cs
+        SELECT cs.id_, cs.actual_teacher_id_,CONCAT(cg.name_,' - ',su.real_name_) name_  FROM course_schedule cs
         LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
         LEFT JOIN sys_user su ON su.id_=cs.actual_teacher_id_
         WHERE cs.music_group_id_ = #{musicGroupId}
-            AND CONCAT(cs.class_date_,' ',cs.start_class_time_) >= #{startTime}
-            AND CONCAT(cs.class_date_,' ',cs.end_class_time_) <= #{endTime}
+            AND cs.class_date_ = DATE_FORMAT(#{startTime},'%Y-%m-%d')
+            AND cs.start_class_time_ >= DATE_FORMAT(#{startTime},'%H:%i:%S')
+            AND cs.end_class_time_ <= DATE_FORMAT(#{endTime},'%H:%i:%S')
             AND cs.group_type_ = 'MUSIC'
             AND cs.teach_mode_ = 'OFFLINE'
         ORDER BY cs.id_ ASC

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

@@ -105,7 +105,7 @@
     <select id="getPlanConclusionCourses" resultMap="com.ym.mec.biz.dal.dao.CourseScheduleDao.CourseSchedule">
         SELECT iipc.course_schedule_id_             id_,
                iipc.teacher_id_                     actual_teacher_id_,
-               CONCAT(cg.name_, '-', su.real_name_) name_
+               CONCAT(cg.name_, ' - ', su.real_name_) name_
         FROM inspection_item_plan_conclusion iipc
                  LEFT JOIN course_schedule cs ON iipc.course_schedule_id_ = cs.id_
                  LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_