Merge remote-tracking branch 'origin/master'

fuliqi

2024-10-29 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d

 src/main/java/com/ycl/jxkg/controller/admin/ExamController.java

@@ -99,8 +99,8 @@

    @PostMapping("/mark/paper")
    @ApiOperation(value = "提交批改", notes = "提交批改")
    public Result submitMarkPaper(@RequestBody ExamPaperMarkVO examPaperMark) {
        return examService.submitMarkPaper(examPaperMark);
    public Result submitMarkPaper(@RequestBody ExamPaperMarkVO form) {
        return examService.submitMarkPaper(form);
    }

    @GetMapping("/monitor/list")
@@ -124,4 +124,17 @@
        return examService.forceSubmit(form);
    }

    @PutMapping("/cancel/{id}")
    @ApiOperation(value = "作废", notes = "作废")
    @PreAuthorize("hasAuthority('exam:cacel')")
    public Result cancel(@PathVariable("id") Integer id) {
        return examService.cancel(id);
    }

    @PutMapping("/recover/{id}")
    @ApiOperation(value = "恢复正常", notes = "恢复正常")
    @PreAuthorize("hasAuthority('exam:recover')")
    public Result recover(@PathVariable("id") Integer id) {
        return examService.recover(id);
    }
}