1、陪练课调整

2、付费陪练课

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupTeacherMapperDao.java

@@ -99,4 +99,15 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
      * @param teacherId
      */
     void updateTeacher(@Param("classGroupIds") Set<Integer> classGroupIds, @Param("teacherId") Integer teacherId);
+
+    /**
+     * @describe 根据团体删除班级
+     * @author Joburgess
+     * @date 2020/2/17
+     * @param groupId:
+     * @param groupType:
+     * @return int
+     */
+    int deleteByGroup(@Param("groupId") String groupId,
+                      @Param("groupType")GroupType groupType);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupTeacherSalaryDao.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
@@ -45,4 +46,15 @@ public interface ClassGroupTeacherSalaryDao extends BaseDAO<Long, ClassGroupTeac
      * @param teacherId
      */
     void updateTeacher(@Param("classGroupIds") Set<Integer> classGroupIds, @Param("teacherId") Integer teacherId);
+
+    /**
+     * @describe 根据团体删除班级
+     * @author Joburgess
+     * @date 2020/2/17
+     * @param groupId:
+     * @param groupType:
+     * @return int
+     */
+    int deleteByGroup(@Param("groupId") String groupId,
+                      @Param("groupType") GroupType groupType);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -217,6 +217,17 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     int deleteCourseSchedulesByMusicGroupID(@Param("musicGroupId")String musicGroupId, @Param("groupType")GroupType groupType);
 
     /**
+     * @describe 根据团体删除班级
+     * @author Joburgess
+     * @date 2020/2/17
+     * @param groupId:
+     * @param groupType:
+     * @return int
+     */
+    int deleteByGroup(@Param("groupId") String groupId,
+                      @Param("groupType")GroupType groupType);
+
+    /**
      * 逻辑删除乐团课程
      * @param musicGroupID
      * @return

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleStudentPaymentDao.java

@@ -210,4 +210,15 @@ public interface CourseScheduleStudentPaymentDao extends BaseDAO<Long, CourseSch
      * @return
      */
     Integer countStudentNum(Integer courseScheduleId);
+
+    /**
+     * @describe 根据团体删除班级
+     * @author Joburgess
+     * @date 2020/2/17
+     * @param groupId:
+     * @param groupType:
+     * @return int
+     */
+    int deleteByGroup(@Param("groupId") String groupId,
+                      @Param("groupType")GroupType groupType);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleTeacherSalaryDao.java

@@ -297,4 +297,15 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 												   @Param("groupType") GroupType groupType);
 
     void batchUpdateTeacher(@Param("courseScheduleIds") Set<Long> courseScheduleIds, @Param("teacherId") Integer teacherId);
+
+	/**
+	 * @describe 根据团体删除班级
+	 * @author Joburgess
+	 * @date 2020/2/17
+	 * @param groupId:
+	 * @param groupType:
+	 * @return int
+	 */
+	int deleteByGroup(@Param("groupId") String groupId,
+					  @Param("groupType")GroupType groupType);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherAttendanceDao.java

@@ -172,4 +172,15 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
 	 * @param teacherId
 	 */
     void batchUpdateTeacher(@Param("courseScheduleIds") Set<Long> courseScheduleIds, @Param("teacherId") Integer teacherId);
+
+	/**
+	 * @describe 根据团体删除班级
+	 * @author Joburgess
+	 * @date 2020/2/17
+	 * @param groupId:
+	 * @param groupType:
+	 * @return int
+	 */
+	int deleteByGroup(@Param("groupId") String groupId,
+					  @Param("groupType")GroupType groupType);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/GroupClassServiceImpl.java

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.service.GroupClassService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Author Joburgess
@@ -35,14 +36,17 @@ public class GroupClassServiceImpl implements GroupClassService {
     private StudentAttendanceDao studentAttendanceDao;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean deleteGroupInfo(String groupId, GroupType groupType) {
         groupDao.deleteGroup(groupId,groupType.getCode());
         classGroupDao.deleteByGroup(groupId,groupType);
+        classGroupTeacherMapperDao.deleteByGroup(groupId,groupType);
+        classGroupTeacherSalaryDao.deleteByGroup(groupId,groupType);
         classGroupStudentMapperDao.deleteByGroup(groupId,groupType);
-        courseScheduleDao.deleteCourseSchedulesByMusicGroupID(groupId,groupType);
-        courseScheduleTeacherSalaryDao.deleteByMusicGroupId(groupId,groupType);
-        courseScheduleStudentPaymentDao.deleteByMusicGroupId(groupId,groupType);
-        teacherAttendanceDao.deleteByMusicGroupId(groupId,groupType);
+        courseScheduleDao.deleteByGroup(groupId,groupType);
+        courseScheduleTeacherSalaryDao.deleteByGroup(groupId,groupType);
+        courseScheduleStudentPaymentDao.deleteByGroup(groupId,groupType);
+        teacherAttendanceDao.deleteByGroup(groupId,groupType);
         studentAttendanceDao.deleteByGroup(groupId,groupType);
         return true;
     }

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

@@ -79,9 +79,9 @@
         </trim>
     </insert>
 
-    <update id="deleteByGroup">
-        UPDATE class_group SET del_flag_ = 1,update_time_=NOW() WHERE music_group_id_=#{groupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-    </update>
+    <delete id="deleteByGroup">
+        DELETE FROM class_group WHERE music_group_id_=#{groupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+    </delete>
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="ClassGroup">

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

@@ -64,7 +64,7 @@
         UPDATE class_group_student_mapper SET status_='QUIT' WHERE class_group_id_ = #{classGroupId} AND status_='NORMAL'
     </delete>
     <delete id="deleteByGroup">
-        UPDATE class_group_student_mapper SET status_='QUIT' WHERE music_group_id_=#{groupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        DELETE FROM class_group_student_mapper WHERE music_group_id_=#{groupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </delete>
 
     <!-- 分页查询 -->

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

@@ -185,4 +185,7 @@
             #{classGroupId}
         </foreach>
     </delete>
+    <delete id="deleteByGroup">
+        DELETE FROM class_group_teacher_mapper WHERE music_group_id_=#{groupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+    </delete>
 </mapper>

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

@@ -20,7 +20,10 @@
     delete from class_group_teacher_salary
     where id_ = #{id}
   </delete>
-  <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary" useGeneratedKeys="true">
+    <delete id="deleteByGroup">
+      DELETE FROM class_group_teacher_salary WHERE music_group_id_=#{groupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+    </delete>
+    <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary" useGeneratedKeys="true">
     insert into class_group_teacher_salary
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="groupType != null">

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

@@ -1723,7 +1723,10 @@
             #{courseScheduleId}
         </foreach>
     </delete>
-    
+    <delete id="deleteByGroup">
+        DELETE FROM course_schedule WHERE music_group_id_=#{groupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+    </delete>
+
     <select id="queryUnsignedStudentList" resultMap="StudentAttendance">
         SELECT cssp.user_id_,cs.actual_teacher_id_ teacher_id_,
         cs.id_ course_schedule_id_,cs.class_group_id_,cs.music_group_id_,cs.group_type_,cg.current_class_times_

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

@@ -315,4 +315,7 @@
 	<delete id="deleteByMusicGroupId" parameterType="map">
 		DELETE cssp FROM course_schedule_student_payment cssp left join course_schedule cs on cssp.course_schedule_id_ = cs.id_ WHERE cssp.music_group_id_=#{musicGroupId} AND cssp.group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} and cs.status_ = 'NOT_START'
 	</delete>
+	<delete id="deleteByGroup">
+		DELETE FROM course_schedule_student_payment WHERE music_group_id_=#{groupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+	</delete>
 </mapper>

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

@@ -430,8 +430,11 @@
     <delete id="deleteByMusicGroupId" parameterType="map" >
 		DELETE cssp FROM course_schedule_teacher_salary cssp left join course_schedule cs on cssp.course_schedule_id_ = cs.id_ WHERE cssp.music_group_id_=#{musicGroupId} AND cssp.group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} and cs.status_ = 'NOT_START'
 	</delete>
+	<delete id="deleteByGroup">
+		DELETE FROM class_group WHERE music_group_id_=#{groupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+	</delete>
 
-    <select id="queryUserNoSettlementListByTypeAndStartClassDate" resultMap="CourseScheduleTeacherSalary">
+	<select id="queryUserNoSettlementListByTypeAndStartClassDate" resultMap="CourseScheduleTeacherSalary">
 		SELECT ts.*,cs.type_,cs.teach_mode_,cs.class_date_,cs.start_class_time_,cs.end_class_time_ FROM course_schedule_teacher_salary ts LEFT JOIN course_schedule cs ON ts.course_schedule_id_ = cs.id_
 		WHERE FIND_IN_SET(cs.type_, #{typeList}) AND ts.user_id_ = #{userId} AND ts.settlement_time_ IS NULL AND cs.class_date_ &gt;= #{startClassDate}
 	</select>

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

@@ -44,13 +44,13 @@
 
     <delete id="deleteGroup">
         DELETE FROM
-        <if test="groupType!=null and groupType='MUSIC'">
+        <if test="groupType!=null and groupType=='MUSIC'.toString()">
             music_group
         </if>
-        <if test="groupType!=null and groupType='VIP'">
+        <if test="groupType!=null and groupType=='VIP'.toString()">
             vip_group
         </if>
-        <if test="groupType!=null and groupType='PRACTICE'">
+        <if test="groupType!=null and groupType=='PRACTICE'.toString()">
             practice_group
         </if>
         WHERE id_=#{groupId}

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

@@ -170,8 +170,7 @@
         </foreach>
     </delete>
     <delete id="deleteByGroup">
-        DELETE sa FROM student_attendance sa LEFT JOIN course_schedule cs ON sa.course_schedule_id_ = cs.id_
-		WHERE sa.music_group_id_=#{musicGroupId} AND sa.group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} and cs.status_ = 'NOT_START'
+        DELETE FROM student_attendance WHERE music_group_id_=#{groupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </delete>
 
     <resultMap id="studentAttendanceViewUtilEntity" type="com.ym.mec.biz.dal.dto.StudentAttendanceViewDto">

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

@@ -385,4 +385,7 @@
     <delete id="deletebyCourseScheduleId">
         DELETE from teacher_attendance WHERE course_schedule_id_=#{courseScheduleId}
     </delete>
+    <delete id="deleteByGroup">
+        DELETE FROM teacher_attendance WHERE music_group_id_=#{groupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+    </delete>
 </mapper>