update

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

@@ -258,7 +258,7 @@
         FROM class_group cg
         LEFT JOIN class_group_student_mapper cgsm ON cg.id_ = cgsm.class_group_id_
         LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
-        WHERE FIND_IN_SET(cg.music_group_id_,#{vipIds}) AND cg.type_ = 'VIP'
+        WHERE FIND_IN_SET(cg.music_group_id_,#{vipIds}) AND cg.type_ = 'VIP' AND cg.del_flag_ = 0
         GROUP BY cg.music_group_id_
     </select>
     <select id="findGroupUsers" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.ImUserModel">
@@ -276,6 +276,7 @@
         FROM student_payment_order spo
         LEFT JOIN class_group cg ON cg.id_ = spo.class_group_id_
         <where>
+                cg.del_flag_ = 0
             <if test="search != null and search != ''">
                 AND cg.name_ LIKE CONCAT('%',#{search},'%')
             </if>
@@ -301,7 +302,7 @@
         FROM student_payment_order spo
         LEFT JOIN class_group cg ON cg.id_ = spo.class_group_id_
         <where>
-                spo.status_ = 'SUCCESS'
+                spo.status_ = 'SUCCESS' AND cg.del_flag_ = 0
             <if test="search != null and search != ''">
                 AND cg.name_ LIKE CONCAT('%',#{search},'%')
             </if>
@@ -364,7 +365,7 @@
         FROM
             vip_group_class_group_mapper vcgm
             LEFT JOIN class_group cg ON vcgm.class_group_id_ = cg.id_
-            WHERE vcgm.vip_group_id_=#{vipGroupId}
+            WHERE vcgm.vip_group_id_=#{vipGroupId} AND cg.del_flag_ = 0
     </select>
 
     <select id="lockClassGroup" resultMap="ClassGroup">
@@ -426,6 +427,7 @@
             AND cs.type_ != 'VIP'
             AND cs.type_ != 'DEMO'
             AND csts.expect_salary_!=0
+            AND cg.del_flag_ = 0
         GROUP BY cg.id_
     </select>
     <select id="findTeacherVipClassGroup" resultMap="TeacherClassGroupDto">
@@ -457,6 +459,7 @@
             cs.actual_teacher_id_ = #{teacherId}
             AND cs.status_ != 'OVER'
             AND cs.type_ = 'VIP'
+            AND cg.del_flag_ = 0
         GROUP BY
             vg.id_,cg.id_
     </select>
@@ -481,7 +484,7 @@
         SELECT cgr.class_group_id_ 'key',GROUP_CONCAT(cg.name_) 'value'
         FROM class_group_relation cgr
         LEFT JOIN class_group cg ON cgr.sub_class_group_id_ = cg.id_
-        WHERE FIND_IN_SET(cgr.class_group_id_,#{classGroupIds})
+        WHERE FIND_IN_SET(cgr.class_group_id_,#{classGroupIds}) AND cg.del_flag_ = 0
         GROUP BY cgr.class_group_id_
     </select>
 
@@ -495,14 +498,14 @@
         SELECT cg.name_ class_group_name_,cg.type_ class_group_type_,
         cg.current_class_times_,cg.id_ class_group_id_
         FROM class_group cg
-        WHERE cg.music_group_id_ = #{search} AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX')
+        WHERE cg.music_group_id_ = #{search} AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX') AND cg.del_flag_ = 0
         <include refid="global.limit"/>
     </select>
 
     <select id="countMusicGroupClassGroup" resultType="java.lang.Integer">
         SELECT COUNT(cg.id_)
         FROM class_group cg
-        WHERE cg.music_group_id_ = #{search} AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX')
+        WHERE cg.music_group_id_ = #{search} AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX') AND cg.del_flag_ = 0
     </select>
 
     <select id="countStudentNum" resultType="java.util.Map">
@@ -526,6 +529,7 @@
 
     <sql id="queryMusicGroupCourseScheduleSql">
         <where>
+                cg.del_flag_ = 0
             <if test="classScheduleType != null and classScheduleType != ''">
                 AND cs.type_ = #{classScheduleType}
             </if>
@@ -584,7 +588,7 @@
 
     <select id="findNameById" resultType="java.util.Map">
         SELECT cg.id_ 'key',cg.name_ 'value'
-        FROM class_group cg WHERE FIND_IN_SET(cg.id_,#{classGroupIds})
+        FROM class_group cg WHERE FIND_IN_SET(cg.id_,#{classGroupIds}) AND cg.del_flag_ = 0
     </select>
 
     <resultMap id="ConditionDto" type="com.ym.mec.biz.dal.dto.ConditionDto">
@@ -622,7 +626,7 @@
         FROM vip_group vg
         LEFT JOIN class_group cg ON cg.music_group_id_ = vg.id_
         LEFT JOIN sys_user su ON vg.user_id_ = su.id_
-        WHERE cg.type_ = 'VIP' AND FIND_IN_SET(vg.id_,#{musicGroupIds})
+        WHERE cg.type_ = 'VIP' AND FIND_IN_SET(vg.id_,#{musicGroupIds}) AND cg.del_flag_ = 0
     </select>
     <select id="queryStudentMusicGroupCourses" resultMap="CourseListDto">
         SELECT mg.id_ music_group_id_,mg.name_ music_group_name_,mgsf.payment_status_,
@@ -631,13 +635,14 @@
         FROM music_group mg
         LEFT JOIN class_group cg ON cg.music_group_id_ = mg.id_
         LEFT JOIN music_group_student_fee_ mgsf ON mgsf.music_group_id_ = mg.id_
-        WHERE FIND_IN_SET(mg.id_,#{musicGroupIds}) AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX')
+        WHERE FIND_IN_SET(mg.id_,#{musicGroupIds}) AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX') AND cg.del_flag_ = 0
         GROUP BY mg.id_,mgsf.id_
     </select>
 
     <!-- 增加实际学生人数 -->
     <update id="addStudentNum" parameterType="com.ym.mec.biz.dal.entity.ClassGroup">
-        UPDATE class_group SET student_num_ = student_num_+1,update_time_=#{classGroup.updateTime} WHERE id_ = #{classGroup.id} AND
+        UPDATE class_group SET student_num_ = student_num_+1,update_time_=#{classGroup.updateTime}
+        WHERE id_ = #{classGroup.id} AND
         student_num_=#{classGroup.studentNum}
     </update>
 
@@ -672,6 +677,7 @@
             <foreach collection="classGroups" open="(" close=")" item="classGroupId" separator=",">
                 #{classGroupId}
             </foreach>
+        AND del_flag_ = 0
     </select>
     <select id="findByCourseSchedule" resultMap="ClassGroup">
         SELECT
@@ -679,7 +685,7 @@
         FROM
             course_schedule cs
             LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
-        WHERE cs.id_=#{courseScheduleId}
+        WHERE cs.id_=#{courseScheduleId} AND cg.del_flag_ = 0
     </select>
     <select id="findClassGroupsByMixClassGroup" resultMap="ClassGroup">
         SELECT
@@ -687,6 +693,6 @@
         FROM
             class_group_relation cgr
         LEFT JOIN class_group cg ON cgr.sub_class_group_id_=cg.id_
-        WHERE cgr.class_group_id_=#{maxCourseScheduleId}
+        WHERE cgr.class_group_id_=#{maxCourseScheduleId} AND cg.del_flag_ = 0
     </select>
 </mapper>