yonge пре 4 година
родитељ
комит
1128835b0f

+ 10 - 0
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;
+	}
+
 }

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

@@ -755,6 +755,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_,
@@ -787,7 +788,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_