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/mapper/ExamPaperScoreMapper.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/mapper/ExamPaperScoreMapper.java b/src/main/java/com/ycl/jxkg/mapper/ExamPaperScoreMapper.java index afc4227..2e75e96 100644 --- a/src/main/java/com/ycl/jxkg/mapper/ExamPaperScoreMapper.java +++ b/src/main/java/com/ycl/jxkg/mapper/ExamPaperScoreMapper.java @@ -15,10 +15,10 @@ @Mapper public interface ExamPaperScoreMapper extends BaseMapper<ExamPaperScore> { - List<ExamPaperScore> studentPage(ExamPaperAnswerPageVO requestVM); + List<ExamPaperAnswerPageResponseVO> studentPage(ExamPaperAnswerPageVO requestVM); Integer selectAllCount(); - + Integer selectAllQuestionCount(); List<KeyValue> selectCountByDate(@Param("startTime") Date startTime, @Param("endTime") Date endTime); ExamPaperScore getByPidUid(@Param("pid") Integer paperId, @Param("uid") Integer uid); @@ -26,4 +26,6 @@ List<ExamPaperAnswerPageResponseVO> adminPage(ExamPaperAnswerPageRequestVO requestVM); List<ExamPaperAnswerPageResponseVO> pageExamPaper(ExamPaperAnswerPageRequestVO model); + + ExamPaperScore getByExamIdUserId(@Param("examId") Integer examId, @Param("userId") Integer userId); } -- Gitblit v1.8.0