删除学生修改

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ClassGroup4MixDto.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
@@ -34,6 +35,9 @@ public class ClassGroup4MixDto {
     @ApiModelProperty(value = "排课次数", required = true)
     private Integer courseTimes;
 
+    @ApiModelProperty(value = "课程类型", required = true)
+    private CourseSchedule.CourseScheduleType courseType;
+
     @ApiModelProperty(value = "排课方式", required = true)
     private List<CourseTimeDto> courseTimeDtoList;
 
@@ -116,4 +120,12 @@ public class ClassGroup4MixDto {
     public void setCourseTimeDtoList(List<CourseTimeDto> courseTimeDtoList) {
         this.courseTimeDtoList = courseTimeDtoList;
     }
+
+    public CourseSchedule.CourseScheduleType getCourseType() {
+        return courseType;
+    }
+
+    public void setCourseType(CourseSchedule.CourseScheduleType courseType) {
+        this.courseType = courseType;
+    }
 }

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

@@ -291,5 +291,5 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
     List<ClassGroup> highClassGroupList(String musicGroupId);
 
 
-    List<ClassGroupTeachersDto> classGroupAndTeacher(int classGroupId);
+    List<ClassGroupTeachersDto> classGroupAndTeacher(Integer classGroupId);
 }

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

@@ -1466,7 +1466,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public List<ClassGroupTeachersDto> classGroupAndTeacher(int classGroupId) {
+    public List<ClassGroupTeachersDto> classGroupAndTeacher(Integer classGroupId) {
         List<ClassGroupTeachersDto> classGroups = classGroupDao.findClassGroupByMixClassGroupId(classGroupId);
         String classGroupIds = "";
         for (ClassGroupTeachersDto classGroupTeachersDto : classGroups) {

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

@@ -240,7 +240,7 @@ public class ClassGroupController extends BaseController {
     @GetMapping("/classGroupAndTeacher")
     @PreAuthorize("@pcs.hasPermissions('classGroup/classGroupAndTeacher')")
     @ApiImplicitParams({@ApiImplicitParam(name = "classGroupId", value = "班级id", required = true, dataType = "int")})
-    public HttpResponseResult classGroupAndTeacher(int classGroupId) throws Exception {
+    public HttpResponseResult classGroupAndTeacher(Integer classGroupId) throws Exception {
         return succeed(classGroupService.classGroupAndTeacher(classGroupId));
     }