Merge remote-tracking branch 'origin/dev' into dev

xiangpei

2024-07-05 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce

 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);
}