|
@@ -1,33 +1,5 @@
|
|
|
package com.ym.mec.web.controller;
|
|
|
|
|
|
-import io.swagger.annotations.Api;
|
|
|
-import io.swagger.annotations.ApiOperation;
|
|
|
-import io.swagger.annotations.ApiParam;
|
|
|
-
|
|
|
-import java.math.BigDecimal;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Objects;
|
|
|
-import java.util.stream.Collectors;
|
|
|
-
|
|
|
-import org.apache.commons.lang.ArrayUtils;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.http.MediaType;
|
|
|
-import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
-import org.springframework.ui.ModelMap;
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
-import org.springframework.util.StringUtils;
|
|
|
-import org.springframework.web.bind.annotation.GetMapping;
|
|
|
-import org.springframework.web.bind.annotation.PathVariable;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
-
|
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
|
import com.ym.mec.biz.dal.dao.ClassGroupTeacherMapperDao;
|
|
@@ -36,11 +8,7 @@ import com.ym.mec.biz.dal.dto.BatchInsertCoursesDto;
|
|
|
import com.ym.mec.biz.dal.dto.CoursePostponeDto;
|
|
|
import com.ym.mec.biz.dal.dto.CreateCourseScheduleDto;
|
|
|
import com.ym.mec.biz.dal.dto.VipGroupCourseAdjustInfoDto;
|
|
|
-import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
|
|
|
-import com.ym.mec.biz.dal.entity.CourseSchedule;
|
|
|
-import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
|
|
|
-import com.ym.mec.biz.dal.entity.Employee;
|
|
|
-import com.ym.mec.biz.dal.entity.MusicGroup;
|
|
|
+import com.ym.mec.biz.dal.entity.*;
|
|
|
import com.ym.mec.biz.dal.enums.AuditStatusEnum;
|
|
|
import com.ym.mec.biz.dal.enums.GroupType;
|
|
|
import com.ym.mec.biz.dal.enums.TeachModeEnum;
|
|
@@ -53,6 +21,21 @@ import com.ym.mec.biz.service.MusicGroupService;
|
|
|
import com.ym.mec.biz.service.StudentAttendanceService;
|
|
|
import com.ym.mec.common.controller.BaseController;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
+import io.swagger.annotations.Api;
|
|
|
+import io.swagger.annotations.ApiOperation;
|
|
|
+import io.swagger.annotations.ApiParam;
|
|
|
+import org.apache.commons.lang.ArrayUtils;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.http.MediaType;
|
|
|
+import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
+import org.springframework.ui.ModelMap;
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
+import org.springframework.util.StringUtils;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
+
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @Author Joburgess
|
|
@@ -343,8 +326,8 @@ public class CourseScheduleController extends BaseController {
|
|
|
@ApiOperation(value = "陪练课课程组老师调整")
|
|
|
@PostMapping("/practiceGroupTeacherAdjust")
|
|
|
@PreAuthorize("@pcs.hasPermissions('courseSchedule/practiceGroupTeacherAdjust')")
|
|
|
- public Object practiceGroupTeacherAdjust(String practiceGroupId, Integer teacherId){
|
|
|
- scheduleService.practiceGroupTeacherAdjust(practiceGroupId,teacherId);
|
|
|
+ public Object practiceGroupTeacherAdjust(String practiceGroupId, Integer teacherId, Integer subjectId){
|
|
|
+ scheduleService.practiceGroupTeacherAdjust(practiceGroupId,teacherId,subjectId);
|
|
|
return succeed();
|
|
|
}
|
|
|
|