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/student/StudentExamController.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/student/StudentExamController.java b/src/main/java/com/ycl/jxkg/controller/student/StudentExamController.java
index d455f65..1b4f34e 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/StudentExamController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/StudentExamController.java
@@ -1,14 +1,13 @@
package com.ycl.jxkg.controller.student;
import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.domain.query.ExamQuery;
import com.ycl.jxkg.domain.vo.ExamSubmitVO;
+import com.ycl.jxkg.domain.vo.StartExamVO;
import com.ycl.jxkg.service.ExamService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* @author锛歺p
@@ -22,13 +21,35 @@
private final ExamService examService;
/**
+ * 瀛﹀憳绔�冭瘯鍒嗛〉
+ *
+ * @param query
+ * @return
+ */
+ @PostMapping("/page")
+ public Result examList(@RequestBody ExamQuery query) {
+ return examService.studentPage(query);
+ }
+
+ /**
+ * 寮�濮嬭�冭瘯
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("/start/{id}")
+ public Result start(@PathVariable("id") Integer id) {
+ return examService.start(id);
+ }
+
+ /**
* 涓诲姩鎻愪氦璇曞嵎
*
* @param submitData
* @return
*/
@PostMapping("/submit")
- public Result examSubmit(@RequestBody @Validated ExamSubmitVO submitData) {
+ public Result examSubmit(@RequestBody @Validated StartExamVO submitData) {
return examService.examSubmit(submitData);
}
@@ -39,7 +60,7 @@
* @return
*/
@PostMapping("/timing")
- public Result timingExamSubmit(@RequestBody @Validated ExamSubmitVO submitData) {
+ public Result timingExamSubmit(@RequestBody @Validated StartExamVO submitData) {
return examService.timingSubmit(submitData);
}
--
Gitblit v1.8.0