|
@@ -24,8 +24,11 @@ import com.xjrsoft.module.schedule.dto.CourseTableDto;
|
|
import com.xjrsoft.module.schedule.dto.CourseTablePreCheckDto;
|
|
import com.xjrsoft.module.schedule.dto.CourseTablePreCheckDto;
|
|
import com.xjrsoft.module.schedule.dto.ScheduleWeekDto;
|
|
import com.xjrsoft.module.schedule.dto.ScheduleWeekDto;
|
|
import com.xjrsoft.module.schedule.dto.ScheduleWeekExportQueryDto;
|
|
import com.xjrsoft.module.schedule.dto.ScheduleWeekExportQueryDto;
|
|
|
|
+import com.xjrsoft.module.schedule.dto.WfCourseAdjustDto;
|
|
import com.xjrsoft.module.schedule.entity.CourseReceiveMsg;
|
|
import com.xjrsoft.module.schedule.entity.CourseReceiveMsg;
|
|
|
|
+import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
|
|
import com.xjrsoft.module.schedule.service.ICourseReceiveMsgService;
|
|
import com.xjrsoft.module.schedule.service.ICourseReceiveMsgService;
|
|
|
|
+import com.xjrsoft.module.schedule.service.IWfCourseAdjustService;
|
|
import com.xjrsoft.module.schedule.util.ScheduleUtil;
|
|
import com.xjrsoft.module.schedule.util.ScheduleUtil;
|
|
import com.xjrsoft.module.schedule.vo.ClassOptionVo;
|
|
import com.xjrsoft.module.schedule.vo.ClassOptionVo;
|
|
import com.xjrsoft.module.schedule.vo.CourseListVo;
|
|
import com.xjrsoft.module.schedule.vo.CourseListVo;
|
|
@@ -80,6 +83,7 @@ public class ScheduleController {
|
|
private final IBaseTeacherService baseTeacherService;
|
|
private final IBaseTeacherService baseTeacherService;
|
|
private final ITeacherbaseManagerService teacherService;
|
|
private final ITeacherbaseManagerService teacherService;
|
|
private final IBaseSemesterService semesterService;
|
|
private final IBaseSemesterService semesterService;
|
|
|
|
+ private final IWfCourseAdjustService courseAdjustService;
|
|
|
|
|
|
@GetMapping(value = "/receive-msg")
|
|
@GetMapping(value = "/receive-msg")
|
|
@ApiOperation(value="接收消息")
|
|
@ApiOperation(value="接收消息")
|
|
@@ -387,4 +391,12 @@ public class ScheduleController {
|
|
List<ClassOptionVo> result = courseTableService.getClassListByTeacherId(dto);
|
|
List<ClassOptionVo> result = courseTableService.getClassListByTeacherId(dto);
|
|
return RT.ok(result);
|
|
return RT.ok(result);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @PostMapping(value = "/cancel")
|
|
|
|
+ @ApiOperation(value="调课顶课的作废")
|
|
|
|
+ @SaCheckPermission("room:detail")
|
|
|
|
+ public RT<Boolean> cancel(@Valid WfCourseAdjustDto dto){
|
|
|
|
+
|
|
|
|
+ return RT.ok(courseAdjustService.cancel(dto));
|
|
|
|
+ }
|
|
}
|
|
}
|