Merge branch 'online1'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupCourseScheduleDto.java

@@ -80,6 +80,8 @@ public class MusicGroupCourseScheduleDto {
     private String remark;
 
     private YesOrNoEnum isCallNames;
+    
+    private Integer schoolId;
 
     public YesOrNoEnum getIsCallNames() {
         return isCallNames;
@@ -273,4 +275,12 @@ public class MusicGroupCourseScheduleDto {
 		this.courseScheduleName = courseScheduleName;
 	}
 
+	public Integer getSchoolId() {
+		return schoolId;
+	}
+
+	public void setSchoolId(Integer schoolId) {
+		this.schoolId = schoolId;
+	}
+
 }

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

@@ -1900,6 +1900,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                                 backCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
                             }
                         }
+                        if(CollectionUtils.isEmpty(preCourseSchedule.getTeachingTeacherIdList())){
+							preCourseSchedule.setTeachingTeacherIdList(new ArrayList<>(Arrays.asList(preCourseSchedule.getActualTeacherId())));
+						}else{
+							preCourseSchedule.getTeachingTeacherIdList().add(preCourseSchedule.getActualTeacherId());
+						}
+                        if(CollectionUtils.isEmpty(backCourseSchedule.getTeachingTeacherIdList())){
+							backCourseSchedule.setTeachingTeacherIdList(new ArrayList<>(Arrays.asList(backCourseSchedule.getActualTeacherId())));
+						}else{
+							backCourseSchedule.getTeachingTeacherIdList().add(backCourseSchedule.getActualTeacherId());
+						}
                         if (!CollectionUtils.isEmpty(preCourseSchedule.getTeachingTeacherIdList())
                                 && !CollectionUtils.isEmpty(backCourseSchedule.getTeachingTeacherIdList())) {
                             List<Integer> repeatIds = preCourseSchedule.getTeachingTeacherIdList()

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

@@ -756,6 +756,7 @@
         <result property="settlementTime" column="settlement_time_"/>
         <result property="remark" column="remark_"/>
         <result property="courseScheduleName" column="course_schedule_name_"/>
+        <result property="schoolId" column="school_id_"/>
     </resultMap>
     <select id="queryMusicGroupCourseSchedule" resultMap="MusicGroupCourseScheduleDto">
         SELECT cs.id_ course_schedule_id_,cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.class_group_id_,
@@ -788,7 +789,8 @@
         cg.name_ class_group_name_,
         ta.sign_in_time_,
         ta.sign_out_time_,
-        ta.remark_
+        ta.remark_,
+        cs.schoole_id_ school_id_
         FROM course_schedule cs
         LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
         LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_

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

@@ -216,7 +216,7 @@
             s.name_ as 'value'
         FROM
             student_registration sr
-            LEFT JOIN `subject` s ON sr.subject_id_ = s.id_
+            LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
         WHERE 1=1
         AND
         <foreach collection="studentInfos" item="student" open="(" close=")" separator=" OR ">