Browse Source

fix:
1、乐团课多班级混合加课导致的教师冲突检测失效
2、乐团加入二要素验证
3、筹备中乐团课表班级名称显示错误

Joburgess 4 years ago
parent
commit
f6a8b06f0c
1 changed files with 8 additions and 2 deletions
  1. 8 2
      mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

+ 8 - 2
mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -738,7 +738,7 @@
     </sql>
     <resultMap id="MusicGroupCourseScheduleDto" type="com.ym.mec.biz.dal.dto.MusicGroupCourseScheduleDto">
         <result property="courseScheduleId" column="course_schedule_id_"/>
-        <result property="classGroupName" column="course_schedule_name_"/>
+        <result property="classGroupName" column="class_group_name_"/>
         <result property="classDate" column="class_date_"/>
         <result property="startClassTime" column="start_class_time_"/>
         <result property="startClassTimeStr" column="start_class_time_"/>
@@ -774,11 +774,17 @@
     </select>
 
     <select id="queryMusicGroupCourseScheduleDetail" resultMap="MusicGroupCourseScheduleDto">
-        SELECT cs.id_ course_schedule_id_,cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.class_group_id_,cs.name_ course_schedule_name_,
+        SELECT cs.id_ course_schedule_id_,
+        cs.class_date_,
+        cs.start_class_time_,
+        cs.end_class_time_,
+        cs.class_group_id_,
+        cs.name_ course_schedule_name_,
         cs.type_ course_schedule_type_,cs.status_ course_schedule_status_,cg.name_ course_schedule_name_,
         IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
         IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
         csts.settlement_time_,
+        cg.name_ class_group_name_,
         ta.sign_in_time_,
         ta.sign_out_time_,
         ta.remark_