From 6043c55ce5a3c4f146e20286a707f67d09384674 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 28 六月 2024 16:00:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/mapper/ExamPaperScoreMapper.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/mapper/ExamPaperAnswerMapper.java b/src/main/java/com/ycl/jxkg/mapper/ExamPaperScoreMapper.java
similarity index 71%
rename from src/main/java/com/ycl/jxkg/mapper/ExamPaperAnswerMapper.java
rename to src/main/java/com/ycl/jxkg/mapper/ExamPaperScoreMapper.java
index a898a20..83ae6aa 100644
--- a/src/main/java/com/ycl/jxkg/mapper/ExamPaperAnswerMapper.java
+++ b/src/main/java/com/ycl/jxkg/mapper/ExamPaperScoreMapper.java
@@ -1,7 +1,7 @@
package com.ycl.jxkg.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
+import com.ycl.jxkg.domain.entity.ExamPaperScore;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.vo.admin.paper.ExamPaperAnswerPageRequestVO;
import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO;
@@ -13,15 +13,15 @@
import java.util.List;
@Mapper
-public interface ExamPaperAnswerMapper extends BaseMapper<ExamPaperAnswer> {
+public interface ExamPaperScoreMapper extends BaseMapper<ExamPaperScore> {
- List<ExamPaperAnswer> studentPage(ExamPaperAnswerPageVO requestVM);
+ List<ExamPaperScore> studentPage(ExamPaperAnswerPageVO requestVM);
Integer selectAllCount();
-
+ Integer selectAllQuestionCount();
List<KeyValue> selectCountByDate(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
- ExamPaperAnswer getByPidUid(@Param("pid") Integer paperId, @Param("uid") Integer uid);
+ ExamPaperScore getByPidUid(@Param("pid") Integer paperId, @Param("uid") Integer uid);
List<ExamPaperAnswerPageResponseVO> adminPage(ExamPaperAnswerPageRequestVO requestVM);
--
Gitblit v1.8.0