From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/service/ExamPaperService.java | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/ExamPaperService.java b/src/main/java/com/ycl/jxkg/service/ExamPaperService.java
index e5e7158..6e19f57 100644
--- a/src/main/java/com/ycl/jxkg/service/ExamPaperService.java
+++ b/src/main/java/com/ycl/jxkg/service/ExamPaperService.java
@@ -1,31 +1,48 @@
package com.ycl.jxkg.service;
-import com.ycl.jxkg.domain.ExamPaper;
-import com.ycl.jxkg.domain.User;
-import com.ycl.jxkg.viewmodel.admin.exam.ExamPaperEditRequestVM;
-import com.ycl.jxkg.viewmodel.admin.exam.ExamPaperPageRequestVM;
-import com.ycl.jxkg.viewmodel.student.dashboard.PaperFilter;
-import com.ycl.jxkg.viewmodel.student.dashboard.PaperInfo;
-import com.ycl.jxkg.viewmodel.student.exam.ExamPaperPageVM;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.domain.entity.ExamPaper;
+import com.ycl.jxkg.domain.entity.User;
+import com.ycl.jxkg.domain.form.ExamPaperForm;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO;
+import com.ycl.jxkg.domain.vo.student.dashboard.PaperFilter;
+import com.ycl.jxkg.domain.vo.student.dashboard.PaperInfo;
+import com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageVO;
import com.github.pagehelper.PageInfo;
import java.util.List;
-public interface ExamPaperService extends BaseService<ExamPaper> {
+public interface ExamPaperService extends IService<ExamPaper> {
- PageInfo<ExamPaper> page(ExamPaperPageRequestVM requestVM);
+ PageInfo<ExamResponseVO> page(ExamPaperPageRequestVO requestVM);
- PageInfo<ExamPaper> taskExamPage(ExamPaperPageRequestVM requestVM);
+// PageInfo<ExamPaper> taskExamPage(ExamPaperPageRequestVO requestVM);
- PageInfo<ExamPaper> studentPage(ExamPaperPageVM requestVM);
+ PageInfo<ExamPaper> studentPage(ExamPaperPageVO requestVM);
- ExamPaper savePaperFromVM(ExamPaperEditRequestVM examPaperEditRequestVM, User user);
+// ExamPaper savePaperFromVM(ExamPaperEditRequestVO examPaperEditRequestVO, User user);
- ExamPaperEditRequestVM examPaperToVM(Integer id);
+ ExamPaperEditRequestVO examPaperToVM(Integer id);
List<PaperInfo> indexPaper(PaperFilter paperFilter);
Integer selectAllCount();
List<Integer> selectMothCount();
+
+ /**
+ *
+ * 鎴戠殑璇曞嵎
+ *
+ * @param paperType
+ * @return
+ */
+ List<ExamPaper> myExamPaper(Integer paperType);
+
+ Result addPaper(ExamPaperForm form);
+
+ Result updateExamPaper(ExamPaperForm form);
}
--
Gitblit v1.8.0