From a820ec5dc1682ac0a31fcbdba3eb4d2c0fe74b64 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 16 七月 2024 17:11:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java b/src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java index 25f191b..388a450 100644 --- a/src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java +++ b/src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java @@ -1,15 +1,17 @@ package com.mindskip.xzs.service; import com.github.pagehelper.PageInfo; -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.domain.*; +import com.mindskip.xzs.domain.vo.ExamPaperDataExportVO; +import com.mindskip.xzs.domain.vo.ExamPaperDataVO; +import com.mindskip.xzs.domain.vo.ExamPaperStatisticVO; 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> { @@ -47,7 +49,7 @@ ExamPaperSubmitVM examPaperAnswerToVM(Integer id); - Integer selectAllCount(); + Integer selectAllCount(List<Integer> deptIds); List<Integer> selectMothCount(); @@ -60,4 +62,20 @@ 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(ExamPaperStatisticVO examPaperStatisticVO); + + Map<String, Object> data(ExamPaperDataVO examPaperDataVO); + + List<ExamPaperDataExportVO> dataExport(ExamPaperDataVO examPaperDataVO); + + /** + * 鑾峰彇涔嬪墠鐨勬垚缁╋紝鍙栨渶浼樻垚缁� + * @param examPaperAnswer 鏈绛斿嵎 + */ + void maxGrade(ExamPaperAnswer examPaperAnswer, Integer templateId); } -- Gitblit v1.8.0