更新维修单

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupStudentMapperService.java

@@ -27,7 +27,7 @@ public interface ClassGroupStudentMapperService extends BaseService<Long, ClassG
      * @param classGroupId
      * @return
      */
-    boolean delClassGroupStudent(Integer userId, Integer classGroupId);
+    boolean delClassGroupStudent(Integer userId, Integer classGroupId,Boolean quitMusicGroup);
 
 
     /**

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

@@ -93,10 +93,10 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean delClassGroupStudent(Integer userId, Integer classGroupId) {
+    public boolean delClassGroupStudent(Integer userId, Integer classGroupId,Boolean quitMusicGroup) {
         ClassGroup classGroup = classGroupService.get(classGroupId);
         Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroupId);
-        if (classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) && studentNum <= 3) {
+        if (!quitMusicGroup && classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) && studentNum <= 3) {
             throw new BizException(classGroup.getName()+"（网络基础训练课班级）人数不能少于3,请调整");
         }
 

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

@@ -1419,7 +1419,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 if (classGroup.getType().equals(ClassGroupTypeEnum.MUSIC_NETWORK)) {
                     classGroupService.delSingle(classGroupId);
                 } else {
-                    classGroupStudentMapperService.delClassGroupStudent(userId, classGroupId);
+                    classGroupStudentMapperService.delClassGroupStudent(userId, classGroupId,true);
                 }
             }
 
@@ -1521,7 +1521,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             if (classGroup.getType().equals(ClassGroupTypeEnum.MUSIC_NETWORK)) {
                 classGroupService.delSingle(classGroupId);
             } else {
-                classGroupStudentMapperService.delClassGroupStudent(userId, classGroupId);
+                classGroupStudentMapperService.delClassGroupStudent(userId, classGroupId,true);
             }
         }
 

mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupStudentController.java

@@ -33,7 +33,7 @@ public class ClassGroupStudentController extends BaseController {
     @ApiImplicitParams({@ApiImplicitParam(name = "userId", value = "用户id", required = true, dataType = "int"),
             @ApiImplicitParam(name = "classGroupId", value = "班级id", required = true, dataType = "int")})
     public HttpResponseResult del(Integer userId, Integer classGroupId) throws Exception {
-        return succeed(classGroupStudentMapperService.delClassGroupStudent(userId, classGroupId));
+        return succeed(classGroupStudentMapperService.delClassGroupStudent(userId, classGroupId,false));
     }
 
     @ApiOperation(value = "查询班级所有学生")