|
@@ -80,10 +80,10 @@ public class TSyncExamStudentScoreController {
|
|
@ApiResponses({@ApiResponse(code = 200, message = "成绩查询信息", response = TSyncExamStudentScoreResult.class)})
|
|
@ApiResponses({@ApiResponse(code = 200, message = "成绩查询信息", response = TSyncExamStudentScoreResult.class)})
|
|
@RequestMapping(value = "/score/list", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/score/list", method = RequestMethod.POST)
|
|
public Result list(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
|
|
public Result list(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
|
|
- @ApiParam(value = "学院id", required = true) @RequestParam String orgId,
|
|
|
|
|
|
+ @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String orgId,
|
|
@ApiParam(value = "专业id", required = false) @RequestParam(required = false) String majorId,
|
|
@ApiParam(value = "专业id", required = false) @RequestParam(required = false) String majorId,
|
|
@ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
|
|
@ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
|
|
- @ApiParam(value = "课程编码", required = false) @RequestParam(required = false) String courseCode,
|
|
|
|
|
|
+ @ApiParam(value = "课程编码", required = true) @RequestParam String courseCode,
|
|
@ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
|
|
@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_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
|
|
return ResultUtil.ok(tSyncExamStudentScoreService.list(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(semesterId), SystemConstant.convertIdToLong(orgId), SystemConstant.convertIdToLong(majorId), SystemConstant.convertIdToLong(clazzId), courseCode));
|
|
return ResultUtil.ok(tSyncExamStudentScoreService.list(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(semesterId), SystemConstant.convertIdToLong(orgId), SystemConstant.convertIdToLong(majorId), SystemConstant.convertIdToLong(clazzId), courseCode));
|
|
@@ -93,10 +93,10 @@ public class TSyncExamStudentScoreController {
|
|
@ApiResponses({@ApiResponse(code = 200, message = "同步信息", response = TBTask.class)})
|
|
@ApiResponses({@ApiResponse(code = 200, message = "同步信息", response = TBTask.class)})
|
|
@RequestMapping(value = "/score/export", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/score/export", method = RequestMethod.POST)
|
|
public Result export(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
|
|
public Result export(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
|
|
- @ApiParam(value = "学院id", required = true) @RequestParam String orgId,
|
|
|
|
|
|
+ @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String orgId,
|
|
@ApiParam(value = "专业id", required = false) @RequestParam(required = false) String majorId,
|
|
@ApiParam(value = "专业id", required = false) @RequestParam(required = false) String majorId,
|
|
@ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
|
|
@ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
|
|
- @ApiParam(value = "课程编码", required = false) @RequestParam(required = false) String courseCode) {
|
|
|
|
|
|
+ @ApiParam(value = "课程编码", required = true) @RequestParam String courseCode) {
|
|
return createScoreTbTask(TaskTypeEnum.SCORE_EXPORT, semesterId, orgId, majorId, clazzId, courseCode);
|
|
return createScoreTbTask(TaskTypeEnum.SCORE_EXPORT, semesterId, orgId, majorId, clazzId, courseCode);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -104,7 +104,7 @@ public class TSyncExamStudentScoreController {
|
|
@ApiResponses({@ApiResponse(code = 200, message = "同步异步任务信息", response = TBSyncTask.class)})
|
|
@ApiResponses({@ApiResponse(code = 200, message = "同步异步任务信息", response = TBSyncTask.class)})
|
|
@RequestMapping(value = "/score/sync", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/score/sync", method = RequestMethod.POST)
|
|
public Result sync(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
|
|
public Result sync(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
|
|
- @ApiParam(value = "学院id", required = true) @RequestParam String orgId) {
|
|
|
|
|
|
+ @ApiParam(value = "课程编码", required = true) @RequestParam String courseCode) {
|
|
SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
QueryWrapper<ExamPrintPlan> examPrintPlanQueryWrapper = new QueryWrapper<ExamPrintPlan>();
|
|
QueryWrapper<ExamPrintPlan> examPrintPlanQueryWrapper = new QueryWrapper<ExamPrintPlan>();
|
|
examPrintPlanQueryWrapper.select(" DISTINCT third_relate_id ").eq("school_id", sysUser.getSchoolId())
|
|
examPrintPlanQueryWrapper.select(" DISTINCT third_relate_id ").eq("school_id", sysUser.getSchoolId())
|
|
@@ -148,10 +148,10 @@ public class TSyncExamStudentScoreController {
|
|
@ApiResponses({@ApiResponse(code = 200, message = "同步信息", response = TBTask.class)})
|
|
@ApiResponses({@ApiResponse(code = 200, message = "同步信息", response = TBTask.class)})
|
|
@RequestMapping(value = "/score/batch_download", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/score/batch_download", method = RequestMethod.POST)
|
|
public Result batchDownload(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
|
|
public Result batchDownload(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
|
|
- @ApiParam(value = "学院id", required = true) @RequestParam String orgId,
|
|
|
|
|
|
+ @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String orgId,
|
|
@ApiParam(value = "专业id", required = false) @RequestParam(required = false) String majorId,
|
|
@ApiParam(value = "专业id", required = false) @RequestParam(required = false) String majorId,
|
|
@ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
|
|
@ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
|
|
- @ApiParam(value = "课程编码", required = false) @RequestParam(required = false) String courseCode) {
|
|
|
|
|
|
+ @ApiParam(value = "课程编码", required = true) @RequestParam String courseCode) {
|
|
return createScoreTbTask(TaskTypeEnum.SCORE_DOWNLOAD, semesterId, orgId, majorId, clazzId, courseCode);
|
|
return createScoreTbTask(TaskTypeEnum.SCORE_DOWNLOAD, semesterId, orgId, majorId, clazzId, courseCode);
|
|
}
|
|
}
|
|
|
|
|