|
@@ -387,7 +387,7 @@
|
|
|
|
|
|
|
|
<!-- 根据主键删除一条记录 -->
|
|
<!-- 根据主键删除一条记录 -->
|
|
|
<update id="delete">
|
|
<update id="delete">
|
|
|
- update course_schedule set del_flag_ = '1',del_time_ = NOW() WHERE id_ = #{id}
|
|
|
|
|
|
|
+ update course_schedule set del_flag_ = '1',del_time_ = NOW() WHERE id_ = #{id} and del_flag_ = '0'
|
|
|
</update>
|
|
</update>
|
|
|
|
|
|
|
|
<update id="deleteCourseSchedulesByMusicGroupID" parameterType="map">
|
|
<update id="deleteCourseSchedulesByMusicGroupID" parameterType="map">
|
|
@@ -396,7 +396,7 @@
|
|
|
<if test="groupType != null and groupType != ''">
|
|
<if test="groupType != null and groupType != ''">
|
|
|
AND group_type_ = #{groupType}
|
|
AND group_type_ = #{groupType}
|
|
|
</if>
|
|
</if>
|
|
|
- and status_ = 'NOT_START'
|
|
|
|
|
|
|
+ and status_ = 'NOT_START' and del_flag_ = '0'
|
|
|
</update>
|
|
</update>
|
|
|
|
|
|
|
|
<update id="logicDeleteCourseSchedulesByMusicGroupID">
|
|
<update id="logicDeleteCourseSchedulesByMusicGroupID">
|
|
@@ -404,7 +404,7 @@
|
|
|
set del_flag_ = '1',del_time_ = NOW()
|
|
set del_flag_ = '1',del_time_ = NOW()
|
|
|
WHERE music_group_id_ = #{musicGroupID}
|
|
WHERE music_group_id_ = #{musicGroupID}
|
|
|
AND group_type_ = 'MUSIC'
|
|
AND group_type_ = 'MUSIC'
|
|
|
- and status_ = 'NOT_START'
|
|
|
|
|
|
|
+ and status_ = 'NOT_START' and del_flag_ = '0'
|
|
|
</update>
|
|
</update>
|
|
|
|
|
|
|
|
<update id="resumeCourseScheduleByMusicGroupId">
|
|
<update id="resumeCourseScheduleByMusicGroupId">
|
|
@@ -419,7 +419,7 @@
|
|
|
<update id="batchDeleteCourseSchedules">
|
|
<update id="batchDeleteCourseSchedules">
|
|
|
update course_schedule set del_flag_ = '1',del_time_ = NOW()
|
|
update course_schedule set del_flag_ = '1',del_time_ = NOW()
|
|
|
WHERE
|
|
WHERE
|
|
|
- CONCAT( class_date_, ' ', start_class_time_ ) > NOW()
|
|
|
|
|
|
|
+ CONCAT( class_date_, ' ', start_class_time_ ) > NOW() and del_flag_ = '0'
|
|
|
AND id_ IN
|
|
AND id_ IN
|
|
|
<foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
|
|
<foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
|
|
|
#{courseScheduleId}
|
|
#{courseScheduleId}
|
|
@@ -431,13 +431,14 @@
|
|
|
<foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
|
|
<foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
|
|
|
#{courseScheduleId}
|
|
#{courseScheduleId}
|
|
|
</foreach>
|
|
</foreach>
|
|
|
|
|
+ and del_flag_ = '0'
|
|
|
</delete>
|
|
</delete>
|
|
|
|
|
|
|
|
<update id="batchDeleteCourseSchedulesWithLogic">
|
|
<update id="batchDeleteCourseSchedulesWithLogic">
|
|
|
UPDATE course_schedule
|
|
UPDATE course_schedule
|
|
|
SET del_flag_ = '1',update_time_ = NOW()
|
|
SET del_flag_ = '1',update_time_ = NOW()
|
|
|
WHERE
|
|
WHERE
|
|
|
- CONCAT( class_date_, ' ', start_class_time_ ) > NOW()
|
|
|
|
|
|
|
+ CONCAT( class_date_, ' ', start_class_time_ ) > NOW() and del_flag_ = '0'
|
|
|
AND id_ IN
|
|
AND id_ IN
|
|
|
<foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
|
|
<foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
|
|
|
#{courseScheduleId}
|
|
#{courseScheduleId}
|
|
@@ -2249,11 +2250,11 @@
|
|
|
|
|
|
|
|
<update id="deleteByGroup">
|
|
<update id="deleteByGroup">
|
|
|
update course_schedule SET del_flag_ = '1',del_time_ = NOW()
|
|
update course_schedule SET del_flag_ = '1',del_time_ = NOW()
|
|
|
- WHERE music_group_id_ = #{groupId}
|
|
|
|
|
|
|
+ WHERE music_group_id_ = #{groupId} and del_flag_ = '0'
|
|
|
AND group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
|
|
AND group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
|
|
|
</update>
|
|
</update>
|
|
|
<update id="deletePreCourse">
|
|
<update id="deletePreCourse">
|
|
|
- update course_schedule SET del_flag_ = '1',del_time_ = NOW() WHERE music_group_id_ = #{musicGroupId} AND group_type_ = 'MUSIC' AND pre_course_flag_ = 1
|
|
|
|
|
|
|
+ update course_schedule SET del_flag_ = '1',del_time_ = NOW() WHERE music_group_id_ = #{musicGroupId} AND group_type_ = 'MUSIC' AND pre_course_flag_ = 1 and del_flag_ = '0'
|
|
|
</update>
|
|
</update>
|
|
|
|
|
|
|
|
<select id="countCurrentTimes" resultType="int">
|
|
<select id="countCurrentTimes" resultType="int">
|
|
@@ -3400,7 +3401,7 @@
|
|
|
UPDATE course_schedule SET member_flag_ = 1 WHERE FIND_IN_SET(id_,#{courseIds})
|
|
UPDATE course_schedule SET member_flag_ = 1 WHERE FIND_IN_SET(id_,#{courseIds})
|
|
|
</update>
|
|
</update>
|
|
|
<update id="batchUpdateDelFlag">
|
|
<update id="batchUpdateDelFlag">
|
|
|
- UPDATE course_schedule SET del_flag_ = 0,update_time_ = NOW() WHERE FIND_IN_SET(id_,#{courseIds})
|
|
|
|
|
|
|
+ UPDATE course_schedule SET del_flag_ = 0,update_time_ = NOW() WHERE FIND_IN_SET(id_,#{courseIds}) and del_flag_ = '1'
|
|
|
</update>
|
|
</update>
|
|
|
<update id="makeSettlementReport">
|
|
<update id="makeSettlementReport">
|
|
|
update course_schedule set settlement_report_flag_ = 1 where DATE_FORMAT(class_date_,'%Y-%m') = #{currentMonth}
|
|
update course_schedule set settlement_report_flag_ = 1 where DATE_FORMAT(class_date_,'%Y-%m') = #{currentMonth}
|
|
@@ -4552,7 +4553,7 @@
|
|
|
update course_schedule set courseware_detail_id_ = #{coursewareDetailId} where id_ = #{courseId}
|
|
update course_schedule set courseware_detail_id_ = #{coursewareDetailId} where id_ = #{courseId}
|
|
|
</update>
|
|
</update>
|
|
|
<update id="cleanDelFlag">
|
|
<update id="cleanDelFlag">
|
|
|
- update course_schedule set del_flag_ = 0,del_time_ = NULL where FIND_IN_SET(id_,#{courseIds})
|
|
|
|
|
|
|
+ update course_schedule set del_flag_ = 0,del_time_ = NULL where FIND_IN_SET(id_,#{courseIds}) and del_flag_ = '1'
|
|
|
</update>
|
|
</update>
|
|
|
|
|
|
|
|
<select id="getTeacherContinuousCourse" resultMap="CourseSchedule">
|
|
<select id="getTeacherContinuousCourse" resultMap="CourseSchedule">
|