|
@@ -2261,24 +2261,24 @@
|
|
|
|
|
|
<select id="endFindCourseSchedules" resultMap="CourseScheduleEndDto">
|
|
<select id="endFindCourseSchedules" resultMap="CourseScheduleEndDto">
|
|
SELECT
|
|
SELECT
|
|
- cs.id_,
|
|
|
|
- cs.group_type_,
|
|
|
|
- cs.music_group_id_,
|
|
|
|
- cs.class_group_id_,
|
|
|
|
- cs.status_,
|
|
|
|
- cs.name_,
|
|
|
|
- CONCAT(cs.class_date_,' ',cs.start_class_time_) course_start_time_,
|
|
|
|
- CONCAT(cs.class_date_,' ',cs.end_class_time_) course_end_time_,
|
|
|
|
- cs.actual_teacher_id_,
|
|
|
|
- cs.teach_mode_,
|
|
|
|
- cs.type_,
|
|
|
|
- cs.schoole_id_,
|
|
|
|
- s.name_ schoole_name_,
|
|
|
|
- o.name_ organ_name_
|
|
|
|
|
|
+ cs.id_,
|
|
|
|
+ cs.group_type_,
|
|
|
|
+ cs.music_group_id_,
|
|
|
|
+ cs.class_group_id_,
|
|
|
|
+ cs.status_,
|
|
|
|
+ cs.name_,
|
|
|
|
+ CONCAT(cs.class_date_,' ',cs.start_class_time_) course_start_time_,
|
|
|
|
+ CONCAT(cs.class_date_,' ',cs.end_class_time_) course_end_time_,
|
|
|
|
+ cs.actual_teacher_id_,
|
|
|
|
+ cs.teach_mode_,
|
|
|
|
+ cs.type_,
|
|
|
|
+ cs.schoole_id_,
|
|
|
|
+ s.name_ schoole_name_,
|
|
|
|
+ o.name_ organ_name_
|
|
FROM
|
|
FROM
|
|
- course_schedule cs
|
|
|
|
- LEFT JOIN school s ON cs.schoole_id_=s.id_
|
|
|
|
- LEFT JOIN organization o ON cs.organ_id_=o.id_
|
|
|
|
|
|
+ course_schedule cs
|
|
|
|
+ LEFT JOIN school s ON cs.schoole_id_=s.id_
|
|
|
|
+ LEFT JOIN organization o ON cs.organ_id_=o.id_
|
|
<include refid="endFindCourseSchedulesCondition"/>
|
|
<include refid="endFindCourseSchedulesCondition"/>
|
|
ORDER BY course_start_time_,cs.id_
|
|
ORDER BY course_start_time_,cs.id_
|
|
<include refid="global.limit"/>
|
|
<include refid="global.limit"/>
|
|
@@ -2862,14 +2862,14 @@
|
|
</resultMap>
|
|
</resultMap>
|
|
<select id="findCourseRate" resultMap="CourseScheduleRateDtoMap">
|
|
<select id="findCourseRate" resultMap="CourseScheduleRateDtoMap">
|
|
SELECT cs.class_date_,
|
|
SELECT cs.class_date_,
|
|
- cs.start_class_time_,
|
|
|
|
- cs.end_class_time_,
|
|
|
|
- cs.id_,
|
|
|
|
- cs.teaching_content_,
|
|
|
|
- GROUP_CONCAT(cse.comment_ SEPARATOR ";") comment_,
|
|
|
|
- cs.status_
|
|
|
|
|
|
+ cs.start_class_time_,
|
|
|
|
+ cs.end_class_time_,
|
|
|
|
+ cs.id_,
|
|
|
|
+ cs.teaching_content_,
|
|
|
|
+ GROUP_CONCAT(cse.comment_ SEPARATOR ";") comment_,
|
|
|
|
+ cs.status_
|
|
FROM course_schedule cs
|
|
FROM course_schedule cs
|
|
- LEFT JOIN course_schedule_evaluate cse ON cs.id_ = cse.course_schedule_id_
|
|
|
|
|
|
+ LEFT JOIN course_schedule_evaluate cse ON cs.id_ = cse.course_schedule_id_
|
|
WHERE cs.group_type_ = #{groupType}
|
|
WHERE cs.group_type_ = #{groupType}
|
|
<if test="groupId != null">
|
|
<if test="groupId != null">
|
|
AND cs.music_group_id_ = #{groupId}
|
|
AND cs.music_group_id_ = #{groupId}
|
|
@@ -3060,18 +3060,18 @@
|
|
</select>
|
|
</select>
|
|
<select id="countStudentVipCoursesWithDate" resultType="map">
|
|
<select id="countStudentVipCoursesWithDate" resultType="map">
|
|
SELECT
|
|
SELECT
|
|
- cssp.user_id_ as 'key',
|
|
|
|
- COUNT( cs.id_ ) as 'value'
|
|
|
|
|
|
+ cssp.user_id_ as 'key',
|
|
|
|
+ COUNT( cs.id_ ) as 'value'
|
|
FROM
|
|
FROM
|
|
- course_schedule_student_payment cssp
|
|
|
|
- LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
|
|
|
|
|
|
+ course_schedule_student_payment cssp
|
|
|
|
+ LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
|
|
WHERE
|
|
WHERE
|
|
- cssp.user_id_ IN
|
|
|
|
- <foreach collection="studentIds" item="studentId" separator="," open="(" close=")">
|
|
|
|
- #{studentId}
|
|
|
|
- </foreach>
|
|
|
|
- AND cssp.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
|
|
|
|
- AND cs.class_date_ BETWEEN #{startTime} AND #{endTime}
|
|
|
|
|
|
+ cssp.user_id_ IN
|
|
|
|
+ <foreach collection="studentIds" item="studentId" separator="," open="(" close=")">
|
|
|
|
+ #{studentId}
|
|
|
|
+ </foreach>
|
|
|
|
+ AND cssp.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
|
|
|
|
+ AND cs.class_date_ BETWEEN #{startTime} AND #{endTime}
|
|
GROUP BY
|
|
GROUP BY
|
|
cssp.user_id_
|
|
cssp.user_id_
|
|
</select>
|
|
</select>
|
|
@@ -3097,11 +3097,11 @@
|
|
|
|
|
|
<select id="countStudentVipCoursesInFuture" resultType="map">
|
|
<select id="countStudentVipCoursesInFuture" resultType="map">
|
|
SELECT
|
|
SELECT
|
|
- cssp.user_id_ as 'key',
|
|
|
|
- COUNT( cs.id_ ) as 'value'
|
|
|
|
|
|
+ cssp.user_id_ as 'key',
|
|
|
|
+ COUNT( cs.id_ ) as 'value'
|
|
FROM
|
|
FROM
|
|
- course_schedule_student_payment cssp
|
|
|
|
- LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
|
|
|
|
|
|
+ course_schedule_student_payment cssp
|
|
|
|
+ LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
|
|
WHERE
|
|
WHERE
|
|
cssp.user_id_ IN
|
|
cssp.user_id_ IN
|
|
<foreach collection="studentIds" item="studentId" separator="," open="(" close=")">
|
|
<foreach collection="studentIds" item="studentId" separator="," open="(" close=")">
|