|
@@ -39,23 +39,24 @@ import java.util.List;
|
|
@Validated
|
|
@Validated
|
|
//@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
|
|
//@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
|
|
public class TeachCourseController {
|
|
public class TeachCourseController {
|
|
|
|
+
|
|
@Resource
|
|
@Resource
|
|
private TeachCourseService teachCourseService;
|
|
private TeachCourseService teachCourseService;
|
|
|
|
|
|
@ApiOperation(value = "教学课程-查询")
|
|
@ApiOperation(value = "教学课程-查询")
|
|
@RequestMapping(value = "/page", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/page", method = RequestMethod.POST)
|
|
- @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
|
|
|
|
-// @OperationLogDetail(detail = "根据查询条件课程名称[{{courseName}}]模糊查询教学课程,查询第[{{pageNumber}}]页,每页查[{{pageSize}}]个", operationType = OperationTypeEnum.SELECT, operationUnit = OperationUnitEnum.TEACH_COURSE,customizedOperationType = CustomizedOperationTypeEnum.SEARCH)
|
|
|
|
|
|
+ @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Result.class) })
|
|
|
|
+ // @OperationLogDetail(detail = "根据查询条件课程名称[{{courseName}}]模糊查询教学课程,查询第[{{pageNumber}}]页,每页查[{{pageSize}}]个", operationType = OperationTypeEnum.SELECT, operationUnit = OperationUnitEnum.TEACH_COURSE,customizedOperationType = CustomizedOperationTypeEnum.SEARCH)
|
|
public Result findTeachCoursePage(@ApiParam(value = "课程名称(模糊查询)") @RequestParam(required = false) String courseName,
|
|
public Result findTeachCoursePage(@ApiParam(value = "课程名称(模糊查询)") @RequestParam(required = false) String courseName,
|
|
- @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
|
|
|
|
- @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
|
|
|
|
|
|
+ @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
|
|
|
|
+ @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
return ResultUtil.ok(teachCourseService.teachCoursePage(courseName, pageNumber, pageSize, requestUser.getId()));
|
|
return ResultUtil.ok(teachCourseService.teachCoursePage(courseName, pageNumber, pageSize, requestUser.getId()));
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "教学课程-手动添加课程")
|
|
@ApiOperation(value = "教学课程-手动添加课程")
|
|
@RequestMapping(value = "/manual_create", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/manual_create", method = RequestMethod.POST)
|
|
- @ApiResponses({@ApiResponse(code = 200, message = "创建成功", response = EditResult.class)})
|
|
|
|
|
|
+ @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
|
|
@OperationLogDetail(detail = "手动添加教学课程,参数[{{teachCourseParams}}]", customizedOperationType = CustomizedOperationTypeEnum.ADD)
|
|
@OperationLogDetail(detail = "手动添加教学课程,参数[{{teachCourseParams}}]", customizedOperationType = CustomizedOperationTypeEnum.ADD)
|
|
public Result manualCreate(@Valid @RequestBody TeachCourseParams teachCourseParams, BindingResult bindingResult) {
|
|
public Result manualCreate(@Valid @RequestBody TeachCourseParams teachCourseParams, BindingResult bindingResult) {
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
@@ -67,7 +68,7 @@ public class TeachCourseController {
|
|
|
|
|
|
@ApiOperation(value = "教学课程-课程表选择教学课程")
|
|
@ApiOperation(value = "教学课程-课程表选择教学课程")
|
|
@RequestMapping(value = "/select_create", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/select_create", method = RequestMethod.POST)
|
|
- @ApiResponses({@ApiResponse(code = 200, message = "创建成功", response = EditResult.class)})
|
|
|
|
|
|
+ @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
|
|
@OperationLogDetail(detail = "从课程表选择并创建教学课程,参数[{{basicCourseIdList}}]", customizedOperationType = CustomizedOperationTypeEnum.ADD)
|
|
@OperationLogDetail(detail = "从课程表选择并创建教学课程,参数[{{basicCourseIdList}}]", customizedOperationType = CustomizedOperationTypeEnum.ADD)
|
|
public Result selectCreate(@ApiParam(value = "基础课程id", required = true) @RequestParam List<Long> basicCourseIdList) {
|
|
public Result selectCreate(@ApiParam(value = "基础课程id", required = true) @RequestParam List<Long> basicCourseIdList) {
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
@@ -77,7 +78,7 @@ public class TeachCourseController {
|
|
|
|
|
|
@ApiOperation(value = "教学课程-教学课程批量导入")
|
|
@ApiOperation(value = "教学课程-教学课程批量导入")
|
|
@RequestMapping(value = "/import", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/import", method = RequestMethod.POST)
|
|
- @ApiResponses({@ApiResponse(code = 200, message = "创建成功", response = EditResult.class)})
|
|
|
|
|
|
+ @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
|
|
@OperationLogDetail(detail = "教学课程批量导入", customizedOperationType = CustomizedOperationTypeEnum.ADD)
|
|
@OperationLogDetail(detail = "教学课程批量导入", customizedOperationType = CustomizedOperationTypeEnum.ADD)
|
|
public Result importTeachCourse(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws IOException, NoSuchFieldException {
|
|
public Result importTeachCourse(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws IOException, NoSuchFieldException {
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
@@ -87,7 +88,7 @@ public class TeachCourseController {
|
|
|
|
|
|
@ApiOperation(value = "教学课程-查找基础课程")
|
|
@ApiOperation(value = "教学课程-查找基础课程")
|
|
@RequestMapping(value = "/find_basic_course", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/find_basic_course", method = RequestMethod.POST)
|
|
- @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
|
|
|
|
|
|
+ @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Result.class) })
|
|
public Result findBasicCourse() {
|
|
public Result findBasicCourse() {
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
return ResultUtil.ok(teachCourseService.findBasicCourseByUser(requestUser));
|
|
return ResultUtil.ok(teachCourseService.findBasicCourseByUser(requestUser));
|
|
@@ -95,7 +96,7 @@ public class TeachCourseController {
|
|
|
|
|
|
@ApiOperation(value = "教学课程-批量删除")
|
|
@ApiOperation(value = "教学课程-批量删除")
|
|
@RequestMapping(value = "/delete", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/delete", method = RequestMethod.POST)
|
|
- @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
|
|
|
|
|
|
+ @ApiResponses({ @ApiResponse(code = 200, message = "删除成功", response = EditResult.class) })
|
|
@OperationLogDetail(detail = "用户根据教学课程id集合[{{idList}}]批量删除教学课程", level = LevelEnum.TERTIARY, operationType = OperationTypeEnum.DELETE, operationUnit = OperationUnitEnum.TEACH_COURSE, customizedOperationType = CustomizedOperationTypeEnum.DELETE)
|
|
@OperationLogDetail(detail = "用户根据教学课程id集合[{{idList}}]批量删除教学课程", level = LevelEnum.TERTIARY, operationType = OperationTypeEnum.DELETE, operationUnit = OperationUnitEnum.TEACH_COURSE, customizedOperationType = CustomizedOperationTypeEnum.DELETE)
|
|
public Result deleteTeachCourse(@ApiParam(value = "选择的要删除的课程id集合", required = true) @RequestParam List<Long> idList) {
|
|
public Result deleteTeachCourse(@ApiParam(value = "选择的要删除的课程id集合", required = true) @RequestParam List<Long> idList) {
|
|
teachCourseService.deleteTeachCourseBatch(idList);
|
|
teachCourseService.deleteTeachCourseBatch(idList);
|
|
@@ -104,7 +105,7 @@ public class TeachCourseController {
|
|
|
|
|
|
@ApiOperation(value = "教师团队-手动添加教师")
|
|
@ApiOperation(value = "教师团队-手动添加教师")
|
|
@RequestMapping(value = "/manual_create_teacher", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/manual_create_teacher", method = RequestMethod.POST)
|
|
- @ApiResponses({@ApiResponse(code = 200, message = "创建成功", response = EditResult.class)})
|
|
|
|
|
|
+ @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
|
|
@OperationLogDetail(detail = "手动添加教师,参数[{{teacherTeamParam}}]", customizedOperationType = CustomizedOperationTypeEnum.ADD)
|
|
@OperationLogDetail(detail = "手动添加教师,参数[{{teacherTeamParam}}]", customizedOperationType = CustomizedOperationTypeEnum.ADD)
|
|
public Result manualCreateTeacher(@Valid @RequestBody TeacherTeamParam teacherTeamParam, BindingResult bindingResult) throws IllegalAccessException {
|
|
public Result manualCreateTeacher(@Valid @RequestBody TeacherTeamParam teacherTeamParam, BindingResult bindingResult) throws IllegalAccessException {
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
@@ -117,10 +118,9 @@ public class TeachCourseController {
|
|
|
|
|
|
@ApiOperation(value = "教师团队-用户表选择教师")
|
|
@ApiOperation(value = "教师团队-用户表选择教师")
|
|
@RequestMapping(value = "/select_create_teacher", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/select_create_teacher", method = RequestMethod.POST)
|
|
- @ApiResponses({@ApiResponse(code = 200, message = "创建成功", response = EditResult.class)})
|
|
|
|
|
|
+ @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
|
|
@OperationLogDetail(detail = "从教师库选择并加入教师团队,参数[{{basicCourseIdList}}]", customizedOperationType = CustomizedOperationTypeEnum.ADD)
|
|
@OperationLogDetail(detail = "从教师库选择并加入教师团队,参数[{{basicCourseIdList}}]", customizedOperationType = CustomizedOperationTypeEnum.ADD)
|
|
- public Result selectCreate(@ApiParam(value = "基础课程id", required = true) @RequestParam Long basicCourseId,
|
|
|
|
- @ApiParam(value = "教师id集合", required = true) @RequestParam List<Long> userIdList) {
|
|
|
|
|
|
+ public Result selectCreate(@ApiParam(value = "基础课程id", required = true) @RequestParam Long basicCourseId, @ApiParam(value = "教师id集合", required = true) @RequestParam List<Long> userIdList) {
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
teachCourseService.selectCreateTeacher(basicCourseId, userIdList, requestUser);
|
|
teachCourseService.selectCreateTeacher(basicCourseId, userIdList, requestUser);
|
|
return ResultUtil.ok();
|
|
return ResultUtil.ok();
|
|
@@ -128,10 +128,10 @@ public class TeachCourseController {
|
|
|
|
|
|
@ApiOperation(value = "教师团队-批量导入教师")
|
|
@ApiOperation(value = "教师团队-批量导入教师")
|
|
@RequestMapping(value = "/import_teacher", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/import_teacher", method = RequestMethod.POST)
|
|
- @ApiResponses({@ApiResponse(code = 200, message = "创建成功", response = EditResult.class)})
|
|
|
|
|
|
+ @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
|
|
@OperationLogDetail(detail = "教学课程批量导入", customizedOperationType = CustomizedOperationTypeEnum.ADD)
|
|
@OperationLogDetail(detail = "教学课程批量导入", customizedOperationType = CustomizedOperationTypeEnum.ADD)
|
|
- public Result importTeacherTeam(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
|
|
|
|
- @ApiParam(value = "基础课程", required = true) @RequestParam Long basicCourseId) throws IOException, NoSuchFieldException, IllegalAccessException {
|
|
|
|
|
|
+ public Result importTeacherTeam(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file, @ApiParam(value = "基础课程", required = true) @RequestParam Long basicCourseId)
|
|
|
|
+ throws IOException, NoSuchFieldException, IllegalAccessException {
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
teachCourseService.importTeacherTeam(file, basicCourseId, requestUser);
|
|
teachCourseService.importTeacherTeam(file, basicCourseId, requestUser);
|
|
return ResultUtil.ok();
|
|
return ResultUtil.ok();
|
|
@@ -139,19 +139,32 @@ public class TeachCourseController {
|
|
|
|
|
|
@ApiOperation(value = "教师团队-分页查询")
|
|
@ApiOperation(value = "教师团队-分页查询")
|
|
@RequestMapping(value = "/teacher_team_page", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/teacher_team_page", method = RequestMethod.POST)
|
|
- @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
|
|
|
|
-// @OperationLogDetail(detail = "根据查询条件课程名称[{{courseName}}]模糊查询教学课程,查询第[{{pageNumber}}]页,每页查[{{pageSize}}]个", operationType = OperationTypeEnum.SELECT, operationUnit = OperationUnitEnum.TEACH_COURSE,customizedOperationType = CustomizedOperationTypeEnum.SEARCH)
|
|
|
|
- public Result findTeachTeamPage(@ApiParam(value = "用户姓名工号(模糊查询)") @RequestParam(required = false) String userInfo,
|
|
|
|
- @ApiParam(value = "基础课程id", required = true) @RequestParam String basicCourseId,
|
|
|
|
- @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
|
|
|
|
- @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
|
|
|
|
- return ResultUtil.ok(teachCourseService.findTeacherTeamPage(userInfo, SystemConstant.convertIdToLong(basicCourseId), pageNumber, pageSize));
|
|
|
|
|
|
+ @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Result.class) })
|
|
|
|
+ // @OperationLogDetail(detail = "根据查询条件课程名称[{{courseName}}]模糊查询教学课程,查询第[{{pageNumber}}]页,每页查[{{pageSize}}]个", operationType = OperationTypeEnum.SELECT, operationUnit = OperationUnitEnum.TEACH_COURSE,customizedOperationType = CustomizedOperationTypeEnum.SEARCH)
|
|
|
|
+ public Result findTeachTeamPage(@ApiParam(value = "用户姓名工号(模糊查询)") @RequestParam(required = false) String userInfo, @ApiParam(value = "基础课程id", required = true) @RequestParam String basicCourseId,
|
|
|
|
+ @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
|
|
|
|
+ @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
|
|
|
|
+ return ResultUtil.ok(
|
|
|
|
+ teachCourseService.findTeacherTeamPage(userInfo, SystemConstant.convertIdToLong(basicCourseId),
|
|
|
|
+ pageNumber, pageSize));
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "教师团队-根据机构查询")
|
|
@ApiOperation(value = "教师团队-根据机构查询")
|
|
@RequestMapping(value = "/find_teacher_by_org", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/find_teacher_by_org", method = RequestMethod.POST)
|
|
- @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
|
|
|
|
|
|
+ @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Result.class) })
|
|
public Result findTeachCoursePage(@ApiParam(value = "课程名称(模糊查询)") @RequestParam(required = false) Long orgId) {
|
|
public Result findTeachCoursePage(@ApiParam(value = "课程名称(模糊查询)") @RequestParam(required = false) Long orgId) {
|
|
return ResultUtil.ok(teachCourseService.findUserByOrgId(orgId));
|
|
return ResultUtil.ok(teachCourseService.findUserByOrgId(orgId));
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @ApiOperation(value = "教学课程-查询课程权重设置状态")
|
|
|
|
+ @RequestMapping(value = "/find_course_weight_setting_status", method = RequestMethod.POST)
|
|
|
|
+ @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Result.class) })
|
|
|
|
+ public Result findCourseWeightSettingStatus(@ApiParam(value = "考试id") @RequestParam(required = false) String examId,
|
|
|
|
+ @ApiParam(value = "课程编号") @RequestParam(required = false) String courseCode) {
|
|
|
|
+ SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
|
|
+ Long userId = requestUser.getId();
|
|
|
|
+ return ResultUtil.ok(
|
|
|
|
+ teachCourseService.findCourseWeightSettingStatus(SystemConstant.convertIdToLong(examId), courseCode,
|
|
|
|
+ userId));
|
|
|
|
+ }
|
|
}
|
|
}
|