|
@@ -18,20 +18,26 @@
|
|
|
<result column="song_" jdbcType="VARCHAR" property="song"/>
|
|
|
<result column="teaching_material_" jdbcType="VARCHAR" property="teachingMaterial"/>
|
|
|
<result column="version_" jdbcType="INTEGER" property="version"/>
|
|
|
- <result column="student_id_list_" jdbcType="VARCHAR" property="studentIdList"/>
|
|
|
+ <result column="student_id_list_" jdbcType="VARCHAR" property="studentIdList"/>
|
|
|
+ <result column="group_name_" jdbcType="VARCHAR" property="groupName"/>
|
|
|
+ <result column="status_" jdbcType="TINYINT" property="status"/>
|
|
|
</resultMap>
|
|
|
<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleEvaluate" useGeneratedKeys="true"
|
|
|
keyColumn="id" keyProperty="id">
|
|
|
- INSERT INTO course_schedule_evaluate (music_group_id_, class_group_id_, course_schedule_id_,music_theory_,song_,
|
|
|
- teaching_material_,teacher_id_, item_, comment_,create_time_,student_id_list_,version_)
|
|
|
+ INSERT INTO course_schedule_evaluate (music_group_id_, class_group_id_, course_schedule_id_, music_theory_,
|
|
|
+ song_,
|
|
|
+ teaching_material_, teacher_id_, item_, comment_, create_time_,
|
|
|
+ student_id_list_, version_, status_)
|
|
|
values (#{musicGroupId,jdbcType=VARCHAR}, #{classGroupId,jdbcType=INTEGER}, #{courseScheduleId,jdbcType=BIGINT},
|
|
|
- #{musicTheory,jdbcType=VARCHAR},#{song,jdbcType=VARCHAR},#{teachingMaterial,jdbcType=VARCHAR},#{teacherId,jdbcType=INTEGER},
|
|
|
- #{item,jdbcType=VARCHAR}, #{comment,jdbcType=LONGVARCHAR},
|
|
|
- NOW(),#{studentIdList},#{version,jdbcType=INTEGER})
|
|
|
+ #{musicTheory,jdbcType=VARCHAR}, #{song,jdbcType=VARCHAR}, #{teachingMaterial,jdbcType=VARCHAR},
|
|
|
+ #{teacherId,jdbcType=INTEGER}, #{item,jdbcType=VARCHAR}, #{comment,jdbcType=LONGVARCHAR}, NOW(),
|
|
|
+ #{studentIdList}, #{version,jdbcType=INTEGER}, #{status,jdbcType=TINYINT})
|
|
|
</insert>
|
|
|
|
|
|
<update id="update" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleEvaluate">
|
|
|
- update course_schedule_evaluate set is_pushed_=#{isPushed} where id_=#{id}
|
|
|
+ update course_schedule_evaluate
|
|
|
+ set is_pushed_=#{isPushed}
|
|
|
+ where id_ = #{id}
|
|
|
</update>
|
|
|
|
|
|
<select id="findByClassGroupId" resultMap="CourseScheduleEvaluate">
|
|
@@ -39,7 +45,9 @@
|
|
|
FROM course_schedule_evaluate cse
|
|
|
LEFT JOIN practice_group pg ON pg.id_ = cse.music_group_id_
|
|
|
LEFT JOIN subject s on s.id_ = pg.subject_id_
|
|
|
- WHERE cse.class_group_id_ = #{classGroupId} ORDER BY create_time_ DESC LIMIT 1
|
|
|
+ WHERE cse.class_group_id_ = #{classGroupId}
|
|
|
+ ORDER BY create_time_ DESC
|
|
|
+ LIMIT 1
|
|
|
</select>
|
|
|
|
|
|
<select id="findByClassGroupIds" resultMap="CourseScheduleEvaluate">
|
|
@@ -91,7 +99,7 @@
|
|
|
|
|
|
<!-- 已完成课程数统计 -->
|
|
|
<select id="getOrganPracticeGroups" resultMap="PracticeGroupsOrgan">
|
|
|
- SELECT COUNT(class_group_id_) buy_nums_,cg.total_class_times_ total_nums_, pg.organ_id_
|
|
|
+ SELECT COUNT(class_group_id_) buy_nums_, cg.total_class_times_ total_nums_, pg.organ_id_
|
|
|
FROM course_schedule cs
|
|
|
LEFT JOIN class_group cg on cg.id_ = cs.class_group_id_
|
|
|
LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
|
|
@@ -105,35 +113,48 @@
|
|
|
|
|
|
<!-- 成交金额 -->
|
|
|
<select id="getOrganMoney" resultMap="PracticeGroupsOrgan">
|
|
|
- SELECT SUM(actual_amount_) total_money_,organ_id_ FROM student_payment_order
|
|
|
- WHERE group_type_='PRACTICE' AND status_='SUCCESS'
|
|
|
+ SELECT SUM(actual_amount_) total_money_, organ_id_
|
|
|
+ FROM student_payment_order
|
|
|
+ WHERE group_type_ = 'PRACTICE'
|
|
|
+ AND status_ = 'SUCCESS'
|
|
|
GROUP BY organ_id_
|
|
|
</select>
|
|
|
<select id="findExpiredDateBeforeReport" resultMap="CourseScheduleEvaluate">
|
|
|
- SELECT * FROM course_schedule_evaluate
|
|
|
- WHERE create_time_ <= #{expiredDate}
|
|
|
- AND (is_pushed_ = 0 OR is_pushed_ IS NULL)
|
|
|
+ SELECT *
|
|
|
+ FROM course_schedule_evaluate
|
|
|
+ WHERE create_time_ <= #{expiredDate}
|
|
|
+ AND (is_pushed_ = 0 OR is_pushed_ IS NULL)
|
|
|
</select>
|
|
|
|
|
|
<select id="findByGroupId" resultMap="CourseScheduleEvaluate">
|
|
|
- SELECT id_,DATE_FORMAT(create_time_, '%Y年%m月') month_ FROM course_schedule_evaluate WHERE music_group_id_ = #{groupId}
|
|
|
+ SELECT id_, DATE_FORMAT(create_time_, '%Y年%m月') month_
|
|
|
+ FROM course_schedule_evaluate
|
|
|
+ WHERE music_group_id_ = #{groupId}
|
|
|
ORDER BY create_time_ ASC
|
|
|
</select>
|
|
|
|
|
|
<select id="findById" resultMap="CourseScheduleEvaluate">
|
|
|
SELECT cse.*, s.name_ subject_name_, pg.student_id_
|
|
|
FROM course_schedule_evaluate cse
|
|
|
- LEFT JOIN practice_group pg ON pg.id_ = cse.music_group_id_
|
|
|
- LEFT JOIN subject s on s.id_ = pg.subject_id_
|
|
|
+ LEFT JOIN practice_group pg ON pg.id_ = cse.music_group_id_
|
|
|
+ LEFT JOIN subject s on s.id_ = pg.subject_id_
|
|
|
WHERE cse.id_ = #{id}
|
|
|
</select>
|
|
|
|
|
|
<select id="findByCourseAndTeacher" resultMap="CourseScheduleEvaluate">
|
|
|
- SELECT * FROM course_schedule_evaluate cse
|
|
|
- WHERE cse.teacher_id_ = #{teacherId} AND cse.course_schedule_id_ = #{courseScheduleId}
|
|
|
+ SELECT *
|
|
|
+ FROM course_schedule_evaluate cse
|
|
|
+ WHERE cse.teacher_id_ = #{teacherId}
|
|
|
+ AND cse.course_schedule_id_ = #{courseScheduleId}
|
|
|
</select>
|
|
|
|
|
|
-<!-- <select id="getNeedReports" resultMap="CourseScheduleEvaluate">-->
|
|
|
-
|
|
|
-<!-- </select>-->
|
|
|
+ <select id="getNeedPostReports" resultMap="CourseScheduleEvaluate">
|
|
|
+ SELECT cse.id_,DATE_FORMAT(cse.create_time_,'%Y年%m月') month_,pg.name_ group_name_ FROM course_schedule_evaluate
|
|
|
+ cse
|
|
|
+ LEFT JOIN practice_group pg on cse.music_group_id_ = pg.id_ WHERE status_= 0
|
|
|
+ <if test="teacherId != null">
|
|
|
+ AND cse.teacher_id_ = #{teacherId}
|
|
|
+ </if>
|
|
|
+ ORDER BY cse.create_time_ ASC
|
|
|
+ </select>
|
|
|
</mapper>
|