From 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 29 十月 2024 13:32:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/controller/admin/ExamController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
index de5f575..4729816 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
+++ b/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);
+ }
}
--
Gitblit v1.8.0