...

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

@@ -109,23 +109,20 @@ create_time_ = #{createTime},
 	<select id="getOrganIdByUserId" resultType="java.lang.Integer">
 		select organ_id_ from sys_user where id_=#{userId}
 	</select>
-    <select id="createCourseSchedulesByDemoGroup" parameterType="com.ym.mec.biz.dal.entity.DemoGroup"
-            resultMap="com.ym.mec.biz.dal.dao.CourseScheduleDao.CourseSchedule">
 	<select id="createCourseSchedulesByDemoGroup" parameterType="com.ym.mec.biz.dal.entity.DemoGroup" resultMap="com.ym.mec.biz.dal.dao.CourseScheduleDao.CourseSchedule">
 		SELECT
 			#{classGroupId} class_group_id_,
 			'NOT_START' status_,
-			DATE_FORMAT(dgcp.start_time_,'%Y-%m-%d') class_date_,
-			dgcp.start_time_ start_class_time_,
-			DATE_ADD(dgcp.start_time_,INTERVAL #{demoGroup.singleClassMinutes} MINUTE) end_class_time_,
+			DATE_FORMAT(dgcp.courses_start_time_,'%Y-%m-%d') class_date_,
+			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_,
 			'demo' type_
 		FROM
 			demo_group_courses_plan dgcp
-			WHERE dgcp.demo_group_id_=#{demoGroup.id} AND dgcp.start_time_ = #{startTime}
+			WHERE dgcp.demo_group_id_=#{demoGroup.id} AND dgcp.courses_start_time_ = #{startTime}
 	</select>
-    <select id="countDemoGroupStudents" resultType="java.lang.Integer">
 	<select id="createCourseScheduleByDemoGroupPlan" parameterType="com.ym.mec.biz.dal.entity.DemoGroup" resultMap="com.ym.mec.biz.dal.dao.CourseScheduleDao.CourseSchedule">
 		SELECT
 			#{classGroupId} class_group_id_,
@@ -149,55 +146,55 @@ create_time_ = #{createTime},
 		WHERE dgcgm.demo_group_id_=#{demoGroupId}
 	</select>
 
-    <sql id="demoGroupQueryCondition">
-        <where>
-            dgcp.status_=0
-            <if test="search!=null">
-                AND su.username_ like concat('%',#{search},'%')
-            </if>
-            <if test="subjectIds!=null and subjectIds!=''">
-                AND FIND_IN_SET(dg.subject_id_,#{subjectIds})
-            </if>
-            <if test="startTime!=null and endTime==null">
-                AND dgcp.start_time_=#{startTime}
-            </if>
-            <if test="startTime!=null and endTime!=null">
-                AND dgcp.start_time_&gt;=#{startTime} AND dgcp.start_time_ &lt;= #{endTime}
-            </if>
-        </where>
-    </sql>
+	<sql id="demoGroupQueryCondition">
+		<where>
+			dgcp.status_=0
+			<if test="search!=null">
+				AND su.username_ like concat('%',#{search},'%')
+			</if>
+			<if test="subjectIds!=null and subjectIds!=''">
+				AND FIND_IN_SET(dg.subject_id_,#{subjectIds})
+			</if>
+			<if test="startTime!=null and endTime==null">
+				AND dgcp.courses_start_time_=#{startTime}
+			</if>
+			<if test="startTime!=null and endTime!=null">
+				AND dgcp.courses_start_time_&gt;=#{startTime} AND dgcp.courses_start_time_ &lt;= #{endTime}
+			</if>
+		</where>
+	</sql>
 
-    <select id="findDemoGroupList" resultMap="studentDemoGroupListDto">
-        SELECT
-        dg.id_ demo_group_id_,
-        su.username_,
-        su.avatar_,
-        t.introduction_,
-        s.name_ subject_name_,
-        COUNT(dgcgm.class_group_id_) number_of_classes_,
-        dgcp.*
-        FROM
-        demo_group dg
-        LEFT JOIN demo_group_courses_plan dgcp ON dg.id_=dgcp.demo_group_id_
-        LEFT JOIN teacher t ON dg.user_id_=t.id_
-        LEFT JOIN sys_user su ON dg.user_id_=su.id_
-        LEFT JOIN `subject` s ON dg.subject_id_=s.id_
-        LEFT JOIN demo_group_class_group_mapper dgcgm ON dg.id_=dgcgm.demo_group_id_
-        <include refid="demoGroupQueryCondition"/>
-        GROUP BY dgcp.id_,dg.id_
-        ORDER BY dgcp.start_time_
-        <include refid="global.limit"/>
-    </select>
-    <select id="countDemoGroupList" resultType="java.lang.Integer">
-        SELECT
-        count(*)
-        FROM
-        demo_group dg
-        LEFT JOIN demo_group_courses_plan dgcp ON dg.id_=dgcp.demo_group_id_
-        LEFT JOIN sys_user su ON dg.user_id_=su.id_
-        <include refid="demoGroupQueryCondition"/>
-    </select>
-    <select id="findClassGroupIDByDemoGroupId" resultType="java.lang.Integer">
+	<select id="findDemoGroupList" resultMap="studentDemoGroupListDto">
+		SELECT
+		dg.id_ demo_group_id_,
+		su.username_,
+		su.avatar_,
+		t.introduction_,
+		s.name_ subject_name_,
+		COUNT(dgcgm.class_group_id_) number_of_classes_,
+		dgcp.*
+		FROM
+		demo_group dg
+		LEFT JOIN demo_group_courses_plan dgcp ON dg.id_=dgcp.demo_group_id_
+		LEFT JOIN teacher t ON dg.user_id_=t.id_
+		LEFT JOIN sys_user su ON dg.user_id_=su.id_
+		LEFT JOIN `subject` s ON dg.subject_id_=s.id_
+		LEFT JOIN demo_group_class_group_mapper dgcgm ON dg.id_=dgcgm.demo_group_id_
+		<include refid="demoGroupQueryCondition"/>
+		GROUP BY dgcp.id_,dg.id_
+		ORDER BY dgcp.courses_start_time_
+		<include refid="global.limit"/>
+	</select>
+	<select id="countDemoGroupList" resultType="java.lang.Integer">
+		SELECT
+			count(*)
+		FROM
+			demo_group dg
+			LEFT JOIN demo_group_courses_plan dgcp ON dg.id_=dgcp.demo_group_id_
+			LEFT JOIN sys_user su ON dg.user_id_=su.id_
+		<include refid="demoGroupQueryCondition"/>
+	</select>
+	<select id="findClassGroupIDByDemoGroupId" resultType="java.lang.Integer">
 		SELECT
 			class_group_id_
 		FROM
@@ -208,38 +205,12 @@ create_time_ = #{createTime},
 		SELECT * FROM demo_group WHERE user_id_=#{teacherId}
 	</select>
 
-    <sql id="teacherDemoGroupsQueryCondition">
-        <where>
-            dg.user_id_=#{teacherId}
-        </where>
-    </sql>
+	<sql id="teacherDemoGroupsQueryCondition">
+		<where>
+			dg.user_id_=#{teacherId}
+		</where>
+	</sql>
 
-    <select id="findTeacherDemoGroups" resultType="com.ym.mec.biz.dal.dto.TeacherManageDemoGroupListDto">
-        SELECT
-        cs.class_date_ classDate,
-        GROUP_CONCAT(DISTINCT CONCAT(cs.start_class_time_,cs.end_class_time_)) startTimes,
-        GROUP_CONCAT(s.name_) subjectNames
-        FROM
-        demo_group dg
-        LEFT JOIN demo_group_class_group_mapper dgcgm ON dg.id_=dgcgm.demo_group_id_
-        LEFT JOIN class_group cg ON dgcgm.class_group_id_=cg.id_
-        LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
-        LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,cg.subject_id_list_)
-        <include refid="teacherDemoGroupsQueryCondition"/>
-        GROUP BY cs.class_date_
-        <include refid="global.limit"/>
-    </select>
-    <select id="countTeacherDemoGroups" resultType="int">
-        SELECT
-        count(*)
-        FROM
-        demo_group dg
-        LEFT JOIN demo_group_class_group_mapper dgcgm ON dg.id_=dgcgm.demo_group_id_
-        LEFT JOIN class_group cg ON dgcgm.class_group_id_=cg.id_
-        LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
-        <include refid="teacherDemoGroupsQueryCondition"/>
-        GROUP BY cs.class_date_
-    </select>
 	<select id="findTeacherDemoGroups" resultType="com.ym.mec.biz.dal.dto.TeacherManageDemoGroupListDto">
 		SELECT
 			cs.class_date_ classDate,
@@ -267,8 +238,7 @@ create_time_ = #{createTime},
 		GROUP BY cs.class_date_
 	</select>
 
-    <select id="findDemoGroupStartClassTimesWithWeekByTeacherId"
-            resultType="com.ym.mec.biz.dal.dto.EducationDemoGroupListDto">
+	<select id="findDemoGroupStartClassTimesWithWeekByTeacherId" resultType="com.ym.mec.biz.dal.dto.EducationDemoGroupListDto">
 		SELECT
 			class_date_ classDate,
 			GROUP_CONCAT(start_class_time_) startClassTimes