update:退团

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

@@ -1,12 +1,11 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.entity.ClassGroupStudentMapper;
-import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
-import com.ym.mec.common.dal.BaseDAO;
+import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+import com.ym.mec.biz.dal.entity.ClassGroupStudentMapper;
+import com.ym.mec.common.dal.BaseDAO;
 
 public interface ClassGroupStudentMapperDao extends BaseDAO<Long, ClassGroupStudentMapper> {
 
@@ -26,14 +25,12 @@ public interface ClassGroupStudentMapperDao extends BaseDAO<Long, ClassGroupStud
 	ClassGroupStudentMapper query(@Param("classGroupId") int classGroupId, @Param("userId") Integer userId);
 
 	/**
-	 * 根据乐团编号修改学生状态
+	 * 根据乐团编号删除指定学生
 	 * @param musicGroupId 乐团编号
 	 * @param userId 学生编号
-	 * @param status 状态
 	 * @return
 	 */
-	int updateUserStatusByMusicGroupId(@Param("musicGroupId") String musicGroupId, @Param("userId") Integer userId,
-			@Param("status") ClassGroupStudentStatusEnum status);
+	int deleteStudentByMusicGroupId(@Param("musicGroupId") String musicGroupId, @Param("userId") Integer userId);
 
 	/**
 	 * 根据班级编号删除关联

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

@@ -354,7 +354,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			musicGroupQuitDao.update(musicGroupQuit);
 
 			if (status == ApprovalStatus.APPROVED) {
-				classGroupStudentMapperDao.updateUserStatusByMusicGroupId(musicGroupId, userId, ClassGroupStudentStatusEnum.QUIT);
+				classGroupStudentMapperDao.deleteStudentByMusicGroupId(musicGroupId, userId);
 
 				// 判断乐器是否是租赁
 				StudentRegistration studentRegistration = studentRegistrationService.queryByUserIdAndMusicGroupId(userId, musicGroupId);

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

@@ -80,7 +80,7 @@
 		SELECT * FROM class_group_student_mapper where class_group_id_ = #{classGroupId} and user_id_ = #{userId}
 	</select>
 	
-	<update id="updateUserStatusByMusicGroupId" parameterType="map">
-		UPDATE class_group_student_mapper set status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} where class_group_id_ in (select id_ from class_group where music_group_id_ = #{musicGroupId}) and user_id_ = #{userId}
-	</update>
+    <delete id="deleteStudentByMusicGroupId" parameterType="map">
+        DELETE FROM class_group_student_mapper WHERE class_group_id_ in (select id_ from class_group where music_group_id_ = #{musicGroupId}) and user_id_ = #{userId}
+    </delete>
 </mapper>