|
@@ -83,42 +83,35 @@ public class TSyncExamStudentScoreController {
|
|
|
@ApiOperation(value = "成绩归档查询列表")
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "成绩查询信息", response = TSyncExamStudentScoreResult.class)})
|
|
|
@RequestMapping(value = "/score/list", method = RequestMethod.POST)
|
|
|
- public Result list(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
|
|
|
- @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String orgId,
|
|
|
- @ApiParam(value = "专业id", required = false) @RequestParam(required = false) String majorId,
|
|
|
+ public Result list(@ApiParam(value = "学期ID", required = true) @RequestParam String semesterId,
|
|
|
+ @ApiParam(value = "考试ID", required = true) @RequestParam(required = true) String examId,
|
|
|
@ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
|
|
|
@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_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(examId), SystemConstant.convertIdToLong(clazzId), courseCode));
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "成绩导出")
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "同步信息", response = TBTask.class)})
|
|
|
@RequestMapping(value = "/score/export", method = RequestMethod.POST)
|
|
|
- public Result export(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
|
|
|
- @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String orgId,
|
|
|
- @ApiParam(value = "专业id", required = false) @RequestParam(required = false) String majorId,
|
|
|
+ public Result export(@ApiParam(value = "学期ID", required = true) @RequestParam String semesterId,
|
|
|
+ @ApiParam(value = "考试ID", required = true) @RequestParam(required = true) String examId,
|
|
|
@ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
|
|
|
@ApiParam(value = "课程编码", required = true) @RequestParam String courseCode) {
|
|
|
- return createScoreTbTask(TaskTypeEnum.SCORE_EXPORT, semesterId, orgId, majorId, clazzId, courseCode);
|
|
|
+ return createScoreTbTask(TaskTypeEnum.SCORE_EXPORT, semesterId, examId, clazzId, courseCode);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "成绩查询同步")
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "同步异步任务信息", response = TBSyncTask.class)})
|
|
|
@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 examId,
|
|
|
@ApiParam(value = "课程编码", required = true) @RequestParam String courseCode) {
|
|
|
SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
|
- Set<Long> examIdSet = basicExamService.list(new QueryWrapper<BasicExam>()
|
|
|
- .lambda()
|
|
|
- .eq(BasicExam::getSemesterId,semesterId))
|
|
|
- .stream()
|
|
|
- .map(BaseEntity::getId)
|
|
|
- .collect(Collectors.toSet());
|
|
|
QueryWrapper<ExamPrintPlan> examPrintPlanQueryWrapper = new QueryWrapper<ExamPrintPlan>();
|
|
|
examPrintPlanQueryWrapper.select(" DISTINCT third_relate_id ").eq("school_id", sysUser.getSchoolId())
|
|
|
- .in("exam_id", examIdSet)
|
|
|
+ .eq("exam_id", examId)
|
|
|
.eq("sync_status", ExamPrintPlanSyncStatusEnum.FINISH);
|
|
|
List<ExamPrintPlan> examPrintPlanList = examPrintPlanService.list(examPrintPlanQueryWrapper);
|
|
|
if (Objects.isNull(examPrintPlanList) || examPrintPlanList.size() == 0) {
|
|
@@ -158,11 +151,10 @@ public class TSyncExamStudentScoreController {
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "同步信息", response = TBTask.class)})
|
|
|
@RequestMapping(value = "/score/batch_download", method = RequestMethod.POST)
|
|
|
public Result batchDownload(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
|
|
|
- @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 examId,
|
|
|
@ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
|
|
|
@ApiParam(value = "课程编码", required = true) @RequestParam String courseCode) {
|
|
|
- return createScoreTbTask(TaskTypeEnum.SCORE_DOWNLOAD, semesterId, orgId, majorId, clazzId, courseCode);
|
|
|
+ return createScoreTbTask(TaskTypeEnum.SCORE_DOWNLOAD, semesterId, examId, clazzId, courseCode);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -180,10 +172,9 @@ public class TSyncExamStudentScoreController {
|
|
|
}
|
|
|
Map<String, Object> map = printCommonService.saveTask(taskTypeEnum);
|
|
|
map.computeIfAbsent("semesterId", v -> SystemConstant.convertIdToLong(params[0]));
|
|
|
- map.computeIfAbsent("orgId", v -> SystemConstant.convertIdToLong(params[1]));
|
|
|
- map.computeIfAbsent("majorId", v -> SystemConstant.convertIdToLong(params[2]));
|
|
|
- map.computeIfAbsent("clazzId", v -> SystemConstant.convertIdToLong(params[3]));
|
|
|
- map.computeIfAbsent("courseCode", v -> params[4]);
|
|
|
+ map.computeIfAbsent("examId", v -> SystemConstant.convertIdToLong(params[1]));
|
|
|
+ map.computeIfAbsent("clazzId", v -> SystemConstant.convertIdToLong(params[2]));
|
|
|
+ map.computeIfAbsent("courseCode", v -> params[3]);
|
|
|
map.computeIfAbsent(SystemConstant.OSS, v -> dictionaryConfig.sysDomain().isOss());
|
|
|
if (taskTypeEnum == TaskTypeEnum.SCORE_EXPORT) {
|
|
|
asyncScoreExportService.exportTask(map);
|