Merge remote-tracking branch 'origin/master'

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

@@ -1,6 +1,8 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import io.swagger.annotations.ApiModelProperty;
+import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
 
 import java.util.Date;
 
@@ -49,6 +51,9 @@ public class TeacherClassHeadInfo {
     @ApiModelProperty(value = "班级名称",required = false)
     private String classGroupName;
 
+    @ApiModelProperty(value = "课程类型",required = false)
+    private CourseScheduleType CourseScheduleType;
+
 
     public Integer getTotalClassTimes() {
         return totalClassTimes;
@@ -153,4 +158,12 @@ public class TeacherClassHeadInfo {
     public void setClassGroupName(String classGroupName) {
         this.classGroupName = classGroupName;
     }
+
+    public CourseSchedule.CourseScheduleType getCourseScheduleType() {
+        return CourseScheduleType;
+    }
+
+    public void setCourseScheduleType(CourseSchedule.CourseScheduleType courseScheduleType) {
+        CourseScheduleType = courseScheduleType;
+    }
 }

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

@@ -308,6 +308,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         teacherClassGroupInfo.setStartClassTime(DateUtil.dateToString(courseSchedule.getStartClassTime(), "HH:mm"));
         teacherClassGroupInfo.setEndClassTime(DateUtil.dateToString(courseSchedule.getEndClassTime(), "HH:mm"));
         teacherClassGroupInfo.setClassGroupName(classGroup.getName());
+        teacherClassGroupInfo.setCourseScheduleType(courseSchedule.getType());
         return teacherClassGroupInfo;
     }