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 | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 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 77c04b8..4729816 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
@@ -1,8 +1,11 @@
package com.ycl.jxkg.controller.admin;
import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.domain.form.AddTimeForm;
import com.ycl.jxkg.domain.form.ExamForm;
+import com.ycl.jxkg.domain.form.ForceSubmitForm;
import com.ycl.jxkg.domain.query.ExamQuery;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperMarkVO;
import com.ycl.jxkg.group.Add;
import com.ycl.jxkg.group.Update;
import com.ycl.jxkg.service.ExamService;
@@ -94,6 +97,12 @@
return examService.getMarkPaperInfo(examId, userId);
}
+ @PostMapping("/mark/paper")
+ @ApiOperation(value = "鎻愪氦鎵规敼", notes = "鎻愪氦鎵规敼")
+ public Result submitMarkPaper(@RequestBody ExamPaperMarkVO form) {
+ return examService.submitMarkPaper(form);
+ }
+
@GetMapping("/monitor/list")
@PreAuthorize("hasAuthority('exam:monitor:list')")
@ApiOperation(value = "鑰冭瘯鐩戞帶鍒楄〃", notes = "鑰冭瘯鐩戞帶鍒楄〃")
@@ -101,4 +110,31 @@
return examService.monitorList(query);
}
+ @PostMapping("/add/time")
+ @PreAuthorize("hasAuthority('exam:add:time')")
+ @ApiOperation(value = "娣诲姞鑰冭瘯鏃堕暱", notes = "娣诲姞鑰冭瘯鏃堕暱")
+ public Result addTime(@RequestBody @Validated AddTimeForm form) {
+ return examService.addTime(form);
+ }
+
+ @PostMapping("/force/submit")
+ @PreAuthorize("hasAuthority('exam:add:time')")
+ @ApiOperation(value = "寮哄埗鎻愪氦璇曞嵎", notes = "寮哄埗鎻愪氦璇曞嵎")
+ public Result forceSubmit(@RequestBody @Validated ForceSubmitForm form) {
+ 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