瀏覽代碼

成绩管理1对多

wangliang 8 月之前
父節點
當前提交
1a2d6e0581

+ 2 - 4
distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TCFinalScoreController.java

@@ -223,10 +223,8 @@ public class TCFinalScoreController {
                                  @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                  @ApiParam(value = "培养方案id", required = true) @RequestParam Long cultureProgramId,
                                  @ApiParam(value = "课程id", required = true) @RequestParam Long courseId,
-                                 @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) throws IOException {
+                                 @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) throws IOException {
         return ResultUtil.ok(tcFinalScoreService.finalScoreList(new Page<>(pageNumber, pageSize), examId, courseCode, paperNumber, cultureProgramId, courseId));
     }
 

+ 3 - 3
distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TCUsualScoreController.java

@@ -141,9 +141,9 @@ public class TCUsualScoreController {
     @ApiResponses({@ApiResponse(code = 200, message = "作业集合信息", response = Object.class)})
     public Result usualScoreTemplateDownloadList(@ApiParam(value = "培养方案id", required = true) @RequestParam Long cultureProgramId,
                                                  @ApiParam(value = "课程id", required = true) @RequestParam Long courseId) {
-        Set<ExcelField> excelFieldList = this.getUsualScoreList(cultureProgramId, courseId);
-        excelFieldList.stream().peek(s -> s.setNull()).collect(Collectors.toList());
-        return ResultUtil.ok(excelFieldList);
+        Set<ExcelField> excelFieldSet = this.getUsualScoreList(cultureProgramId, courseId);
+        excelFieldSet.stream().peek(s -> s.setNull()).collect(Collectors.toSet());
+        return ResultUtil.ok(excelFieldSet);
     }
 
     @ApiOperation(value = "导入平时成绩")