增加课程类型

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

@@ -142,6 +142,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 //		}
 	}
 
+	/**
+	 * @Author: Joburgess
+	 * @Date: 2019/9/29
+	 * 创建课程名
+	 */
+	private void createCourseScheduleName(List<CourseSchedule> courseSchedules){
+
+	}
+
 	private Map<Integer,Integer> convertToMap(String[] result){
 		Map<Integer,Integer> map=new HashMap<>();
 		for(String s:result){

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

@@ -135,7 +135,7 @@
         <result property="courseStatus" column="course_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="classId" column="class_id"/>
         <result property="className" column="class_name"/>
-        <result property="classType" column="class_type"/>
+        <result property="classType" column="class_type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="musicGroupId" column="music_group_id"/>
         <result property="musicGroupName" column="music_group_name"/>
         <result property="schoolId" column="school_id_"/>
@@ -153,7 +153,7 @@
             cs.status_ course_status_,
             cg.id_ class_id,
             cg.name_ class_name,
-            cg.type_ class_type,
+            cs.type_ class_type,
             mg.id_ music_group_id,
             mg.name_ music_group_name,
             s.id_ school_id_,
@@ -210,6 +210,7 @@
     <select id="getCourseSchedulesWithDate" resultMap="courseScheduleDto">
         SELECT
             cg.*,
+            cs.type_,
             cs.class_date_,
             cs.start_class_time_
         FROM
@@ -222,7 +223,7 @@
         SELECT
             cg.id_ seal_class_id_,
             cg.name_,
-            cg.type_,
+            cs.type_,
             cs.id_,
             cs.class_date_,
             CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
@@ -246,7 +247,7 @@
             cg.id_ seal_class_id_,
             cg.name_,
             su.username_ teacher_name_,
-            cg.type_,
+            cs.type_,
             cs.id_,
             cs.class_date_,
             CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,

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

@@ -117,7 +117,8 @@ create_time_ = #{createTime},
 			dgcp.courses_start_time_ start_class_time_,
 			DATE_ADD(dgcp.courses_start_time_,INTERVAL #{demoGroup.singleClassMinutes} MINUTE) end_class_time_,
 			#{demoGroup.userId} teacher_id_,
-			'ONLINE' teach_mode_
+			'ONLINE' teach_mode_,
+			'demo' type_
 		FROM
 			demo_group_courses_plan dgcp
 			WHERE dgcp.demo_group_id_=#{demoGroup.id} AND dgcp.courses_start_time_ = #{startTime}
@@ -135,7 +136,7 @@ create_time_ = #{createTime},
 		<where>
 			dgcp.status_=0
 			<if test="search!=null">
-				AND su.username like concat('%',#{search},'%')
+				AND su.username_ like concat('%',#{search},'%')
 			</if>
 			<if test="subjectIds!=null and subjectIds!=''">
 				AND FIND_IN_SET(dg.subject_id_,#{subjectIds})