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/repository/ExamPaperMapper.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/repository/ExamPaperMapper.java b/src/main/java/com/mindskip/xzs/repository/ExamPaperMapper.java
index 2e81460..42b7744 100644
--- a/src/main/java/com/mindskip/xzs/repository/ExamPaperMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/ExamPaperMapper.java
@@ -1,9 +1,9 @@
package com.mindskip.xzs.repository;
-import com.mindskip.xzs.domain.ExamMiss;
import com.mindskip.xzs.domain.ExamPaper;
import com.mindskip.xzs.domain.other.KeyValue;
import com.mindskip.xzs.domain.vo.PaperExcelVO;
+import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperPageRequestVM;
import com.mindskip.xzs.viewmodel.student.dashboard.PaperFilter;
import com.mindskip.xzs.viewmodel.student.dashboard.PaperInfo;
@@ -25,7 +25,7 @@
List<PaperInfo> indexPaper(PaperFilter paperFilter);
- Integer selectAllCount();
+ Integer selectAllCount(List<Integer> deptIds);
List<KeyValue> selectCountByDate(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
@@ -39,7 +39,7 @@
List<PaperExcelVO> getPaperExcelById(@Param("id") Integer id);
- void saveMissExamUser(long examPaperId);
+ List<ExamPaper> list(List<Integer> deptIds);
- List<ExamPaper> selectTimeTaskPaper(Date time);
+ List<UserVO> selectStudent(UserVO userVO);
}
--
Gitblit v1.8.0