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/service/ExamService.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/ExamService.java b/src/main/java/com/ycl/jxkg/service/ExamService.java
index d79fdd1..b07b8b2 100644
--- a/src/main/java/com/ycl/jxkg/service/ExamService.java
+++ b/src/main/java/com/ycl/jxkg/service/ExamService.java
@@ -8,6 +8,8 @@
import com.ycl.jxkg.domain.form.ForceSubmitForm;
import com.ycl.jxkg.domain.query.ExamQuery;
import com.ycl.jxkg.domain.vo.ExamSubmitVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperMarkVO;
+import com.ycl.jxkg.domain.vo.StartExamVO;
import java.util.List;
@@ -73,7 +75,7 @@
* @param submitData
* @return
*/
- Result examSubmit(ExamSubmitVO submitData);
+ Result examSubmit(StartExamVO submitData);
/**
* 瀹氭椂淇濆瓨璇曞嵎锛岄槻姝㈣�冭瘯宕╂簝
@@ -81,7 +83,7 @@
* @param submitData
* @return
*/
- Result timingSubmit(ExamSubmitVO submitData);
+ Result timingSubmit(StartExamVO submitData);
/**
* 鑾峰彇闃呭嵎淇℃伅
@@ -117,6 +119,14 @@
Result getMarkPaperInfo(Integer examId, Integer userId);
/**
+ * 鎻愪氦闃呭嵎
+ *
+ * @param examPaperMark
+ * @return
+ */
+ Result submitMarkPaper(ExamPaperMarkVO examPaperMark);
+
+ /**
* 鏍规嵁鑰冭瘯id鑾峰彇鐩戞帶鍒楄〃
* @param query 鑰冭瘯id
* @return 鐩戞帶鍒楄〃
@@ -138,4 +148,23 @@
* @return
*/
Result forceSubmit(ForceSubmitForm form);
+
+
+ /**
+ * 浣滃簾
+ *
+ * @param id
+ * @return {@link Result }
+ * @author
+ */
+ Result cancel(Integer id);
+
+ /**
+ * 鎭㈠
+ *
+ * @param id
+ * @return {@link Result }
+ * @author
+ */
+ Result recover(Integer id);
}
--
Gitblit v1.8.0