From f4f84ef25ce94e59dfe57961fcbb3c81f738ebb8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 五月 2024 16:26:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/ExamPaperService.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/ExamPaperService.java b/src/main/java/com/mindskip/xzs/service/ExamPaperService.java
index 4eef7e7..8db3f0a 100644
--- a/src/main/java/com/mindskip/xzs/service/ExamPaperService.java
+++ b/src/main/java/com/mindskip/xzs/service/ExamPaperService.java
@@ -1,15 +1,16 @@
package com.mindskip.xzs.service;
+import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.domain.ExamPaper;
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.vo.PaperExcelVO;
+import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM;
+import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVO;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperPageRequestVM;
import com.mindskip.xzs.viewmodel.student.dashboard.PaperFilter;
import com.mindskip.xzs.viewmodel.student.dashboard.PaperInfo;
import com.mindskip.xzs.viewmodel.student.exam.ExamPaperPageVM;
-import com.github.pagehelper.PageInfo;
-import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -23,11 +24,11 @@
ExamPaper savePaperFromVM(ExamPaperEditRequestVM examPaperEditRequestVM, User user) throws Exception;
- ExamPaperEditRequestVM examPaperToVM(Integer id);
+ ExamPaperEditRequestVO examPaperToVM(Integer id);
List<PaperInfo> indexPaper(PaperFilter paperFilter);
- Integer selectAllCount();
+ Integer selectAllCount(List<Integer> deptIds);
List<Integer> selectMothCount();
@@ -36,4 +37,10 @@
List<ExamPaper> gets(Integer[] ids);
List<PaperExcelVO> getPaperExcelById(Integer id);
+
+ void missExam(ExamPaperEditRequestVM model);
+
+ List<ExamPaper> list(List<Integer> deptIds);
+
+ PageInfo<UserVO> selectStudent(UserVO userVO);
}
--
Gitblit v1.8.0