From decf7856a39ff88488285cac45d3298f2844d614 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 14 五月 2024 18:12:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java b/src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java index 50af730..5f24cad 100644 --- a/src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java +++ b/src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java @@ -1,16 +1,14 @@ package com.mindskip.xzs.service; -import com.mindskip.xzs.domain.ExamPaperAnswer; -import com.mindskip.xzs.domain.ExamPaperAnswerInfo; -import com.mindskip.xzs.domain.ExamTemplatesUserCount; -import com.mindskip.xzs.domain.User; -import com.mindskip.xzs.viewmodel.student.exam.ExamPaperSubmitVM; -import com.mindskip.xzs.viewmodel.student.exampaper.ExamPaperAnswerPageResponseVM; -import com.mindskip.xzs.viewmodel.student.exampaper.ExamPaperAnswerPageVM; import com.github.pagehelper.PageInfo; -import org.apache.ibatis.annotations.Param; +import com.mindskip.xzs.domain.*; +import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradePageRequestVM; +import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradeQuery; +import com.mindskip.xzs.viewmodel.student.exam.ExamPaperSubmitVM; +import com.mindskip.xzs.viewmodel.student.exampaper.ExamPaperAnswerPageVM; import java.util.List; +import java.util.Map; public interface ExamPaperAnswerService extends BaseService<ExamPaperAnswer> { @@ -60,4 +58,11 @@ List<ExamPaperAnswer> getByExamPaperIdAndUserId(List<ExamTemplatesUserCount> examTemplatesUserCount); + PageInfo<ExamPaperAnswer> adminPageByGrade(ExamPaperGradePageRequestVM grade); + + List<ExamPaperAnswer> getByScorePaperIdAndUserId(List<ScoreTemplatesUserCount> scoreTemplatesUserCounts); + + PageInfo<ExamPaperAnswer> getByCreatUser(ExamPaperGradeQuery query); + + Map<String, Object> statistic(String examPaperId, String departmentId); } -- Gitblit v1.8.0