1、作业消息推送

2、对外课程组查看

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

@@ -1,12 +1,12 @@
 package com.ym.mec.biz.dal.dto;
 
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
 
 /**
  * @Author Joburgess
@@ -23,6 +23,8 @@ public class StudentManageCourseListDto {
     @ApiModelProperty(value = "班级类型(普通班级、合奏班级、提高课班级、VIP班级)",required = true)
     private ClassGroupTypeEnum classGroupType;
 
+    private CourseSchedule.CourseScheduleType courseScheduleType;
+
     @ApiModelProperty(value = "上课日期",required = false)
     private Date courseDate;
 
@@ -41,6 +43,14 @@ public class StudentManageCourseListDto {
     @ApiModelProperty(value = "总课时",required = false)
     private Integer totalClassTimes;
 
+    public CourseSchedule.CourseScheduleType getCourseScheduleType() {
+        return courseScheduleType;
+    }
+
+    public void setCourseScheduleType(CourseSchedule.CourseScheduleType courseScheduleType) {
+        this.courseScheduleType = courseScheduleType;
+    }
+
     public Integer getTotalClassTimes() {
         return totalClassTimes;
     }

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

@@ -7,6 +7,7 @@
         <result property="classGroupId" column="class_group_id_" />
         <result property="classGroupName" column="class_group_name_" />
         <result property="classGroupType" column="class_group_type_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="courseScheduleType" column="course_schedule_type_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="courseDate" column="course_date_" />
         <result property="courseStatus" column="course_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="teacherName" column="teacher_name_" />
@@ -279,6 +280,7 @@
             cg.id_ class_group_id_,
             cg.name_ class_group_name_,
             cg.type_ class_group_type_,
+            cs.type_ course_schedule_type_,
             CONCAT(cs.class_date_," ",cs.start_class_time_) course_date_,
             su.real_name_ teacher_name_,
             IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_,