From 8f20b8b0442e484220352455addc8c2e6945b153 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 25 六月 2024 16:51:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/controller/admin/ExamController.java | 11 +++++++++--
1 files changed, 9 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 02aacdb..f9d5deb 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
@@ -83,8 +83,15 @@
@GetMapping("/mark/paper/{id}")
@PreAuthorize("hasAuthority('exam:markPaper')")
+ @ApiOperation(value = "鑾峰彇鑰冭瘯缁撴灉淇℃伅", notes = "鑾峰彇鑰冭瘯缁撴灉淇℃伅")
+ public Result getMarkResultInfo(@PathVariable("id") Integer id) {
+ return examService.getMarkResultInfo(id);
+ }
+
+ @GetMapping("/mark/paper/{examId}/{userId}")
+ @PreAuthorize("hasAuthority('exam:markPaper')")
@ApiOperation(value = "鑾峰彇闃呭嵎淇℃伅", notes = "鑾峰彇闃呭嵎淇℃伅")
- public Result getMarkPaperInfo(@PathVariable("id") Integer id) {
- return examService.getMarkPaperInfo(id);
+ public Result getMarkPaperInfo(@PathVariable("examId") Integer examId, @PathVariable("userId") Integer userId) {
+ return examService.getMarkPaperInfo(examId, userId);
}
}
--
Gitblit v1.8.0