|
|
@@ -26,7 +26,8 @@
|
|
|
</resultMap>
|
|
|
|
|
|
<select id="get" parameterType="java.lang.Integer" resultMap="CourseScheduleReview">
|
|
|
- select * from course_schedule_review
|
|
|
+ select *
|
|
|
+ from course_schedule_review
|
|
|
where id_ = #{id,jdbcType=INTEGER}
|
|
|
</select>
|
|
|
|
|
|
@@ -126,7 +127,8 @@
|
|
|
|
|
|
<sql id="practiceGroupReviewsQueryCondition">
|
|
|
<where>
|
|
|
- AND pg.id_ > 0 AND cs.group_type_='PRACTICE' AND cs.status_='OVER' AND (cs.del_flag_ = 0 OR cs.del_flag_ IS NULL)
|
|
|
+ AND pg.id_ > 0 AND cs.group_type_='PRACTICE' AND cs.status_='OVER' AND (cs.del_flag_ = 0 OR cs.del_flag_ IS
|
|
|
+ NULL)
|
|
|
<if test="organId != null">
|
|
|
AND FIND_IN_SET(pg.organ_id_,#{organId})
|
|
|
</if>
|
|
|
@@ -146,7 +148,7 @@
|
|
|
AND pg.buy_months_ IS NULL
|
|
|
</if>
|
|
|
<if test="studentReview !=null">
|
|
|
- AND pg.student_review_ =#{studentReview}
|
|
|
+ AND csc.score_ =#{studentReview}
|
|
|
</if>
|
|
|
<if test='hasReview !=null and hasReview=="1"'>
|
|
|
AND csr.id_ > 0
|
|
|
@@ -179,14 +181,17 @@
|
|
|
</sql>
|
|
|
|
|
|
<select id="getPracticeGroupReviewList" resultMap="CourseReviewDto">
|
|
|
- SELECT cs.id_,cs.class_date_, pg.subject_id_,pg.organ_id_,pg.name_ coursre_name_,su.real_name_ teacher_name_,edsu.real_name_
|
|
|
- edu_teacher_name_,pg.buy_months_,csr.id_ review_id_, csr.student_review_,csr.hand_homework_,csr.course_review_
|
|
|
+ SELECT cs.id_,cs.class_date_, pg.subject_id_,pg.organ_id_,pg.name_ coursre_name_,su.real_name_
|
|
|
+ teacher_name_,edsu.real_name_
|
|
|
+ edu_teacher_name_,pg.buy_months_,csr.id_ review_id_, csc.score_ student_review_,csr.hand_homework_,csr.course_review_
|
|
|
FROM course_schedule cs
|
|
|
LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
|
|
|
LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
|
|
|
LEFT JOIN sys_user edsu ON pg.educational_teacher_id_ = edsu.id_
|
|
|
LEFT JOIN course_schedule_review csr on cs.id_ = csr.course_schedule_id_
|
|
|
+ LEFT JOIN course_schedule_complaints csc on csc.course_schedule_id_ = cs.id_
|
|
|
<include refid="practiceGroupReviewsQueryCondition"/>
|
|
|
+ ORDER BY cs.class_date_ DESC
|
|
|
<include refid="global.limit"/>
|
|
|
</select>
|
|
|
|
|
|
@@ -194,6 +199,7 @@
|
|
|
SELECT count(*) FROM course_schedule cs
|
|
|
LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
|
|
|
LEFT JOIN course_schedule_review csr on cs.id_ = csr.course_schedule_id_
|
|
|
+ LEFT JOIN course_schedule_complaints csc on csc.course_schedule_id_ = cs.id_
|
|
|
<include refid="practiceGroupReviewsQueryCondition"/>
|
|
|
</select>
|
|
|
|
|
|
@@ -246,13 +252,26 @@
|
|
|
LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
|
|
|
<include refid="practiceGroupReviews4EduQueryCondition"/>
|
|
|
</select>
|
|
|
+
|
|
|
<select id="findByCourseScheduleAndStudent" resultMap="CourseScheduleReview">
|
|
|
- SELECT * FROM course_schedule_review WHERE course_schedule_id_=#{courseScheduleId} AND student_id_=#{studentId}
|
|
|
+ SELECT *
|
|
|
+ FROM course_schedule_review
|
|
|
+ WHERE course_schedule_id_ = #{courseScheduleId}
|
|
|
+ AND student_id_ = #{studentId}
|
|
|
</select>
|
|
|
+
|
|
|
<select id="findByCourseSchedules" resultMap="CourseScheduleReview">
|
|
|
SELECT * FROM course_schedule_review WHERE course_schedule_id_ IN
|
|
|
<foreach collection="courseScheduleIds" item="courseScheduleId" separator="," open="(" close=")">
|
|
|
#{courseScheduleId}
|
|
|
</foreach>
|
|
|
</select>
|
|
|
+
|
|
|
+ <select id="findByCourseSchedulesAndStudentId" resultMap="CourseScheduleReview">
|
|
|
+ SELECT * FROM course_schedule_review WHERE course_schedule_id_ IN
|
|
|
+ <foreach collection="courseScheduleIds" item="courseScheduleId" separator="," open="(" close=")">
|
|
|
+ #{courseScheduleId}
|
|
|
+ </foreach>
|
|
|
+ AND student_id_ = #{studentId}
|
|
|
+ </select>
|
|
|
</mapper>
|
Joburgess