yonge 4 years ago
parent
commit
054339a5e5

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

@@ -11,6 +11,9 @@ public class MusicGroupCourseScheduleDto {
 
 
     @ApiModelProperty(value = "课程编号")
     @ApiModelProperty(value = "课程编号")
     private Integer courseScheduleId;
     private Integer courseScheduleId;
+    
+    @ApiModelProperty(value = "课程名称")
+    private String courseScheduleName;
 
 
     @ApiModelProperty(value = "上课日期",required = false)
     @ApiModelProperty(value = "上课日期",required = false)
     private String classDate;
     private String classDate;
@@ -262,4 +265,12 @@ public class MusicGroupCourseScheduleDto {
         this.masterTeacherName = masterTeacherName;
         this.masterTeacherName = masterTeacherName;
     }
     }
 
 
+	public String getCourseScheduleName() {
+		return courseScheduleName;
+	}
+
+	public void setCourseScheduleName(String courseScheduleName) {
+		this.courseScheduleName = courseScheduleName;
+	}
+
 }
 }

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

@@ -754,6 +754,7 @@
         <result property="signOutStatus" column="sign_out_status_"/>
         <result property="signOutStatus" column="sign_out_status_"/>
         <result property="settlementTime" column="settlement_time_"/>
         <result property="settlementTime" column="settlement_time_"/>
         <result property="remark" column="remark_"/>
         <result property="remark" column="remark_"/>
+        <result property="courseScheduleName" column="course_schedule_name_"/>
     </resultMap>
     </resultMap>
     <select id="queryMusicGroupCourseSchedule" resultMap="MusicGroupCourseScheduleDto">
     <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_,
         SELECT cs.id_ course_schedule_id_,cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.class_group_id_,
@@ -773,7 +774,7 @@
     </select>
     </select>
 
 
     <select id="queryMusicGroupCourseScheduleDetail" resultMap="MusicGroupCourseScheduleDto">
     <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_,
+        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_,
         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_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_,
         IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,