From 161d73fef78ab215077a5f1e87d8b586f29c764f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 23 五月 2024 16:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java
index 6b0d9f2..8270867 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java
@@ -10,6 +10,7 @@
import com.mindskip.xzs.domain.other.ExamPaperAnswerUpdate;
import com.mindskip.xzs.domain.other.KeyValue;
import com.mindskip.xzs.domain.task.TaskItemAnswerObject;
+import com.mindskip.xzs.domain.vo.ExamPaperDataVO;
import com.mindskip.xzs.domain.vo.ExamPaperStatisticVO;
import com.mindskip.xzs.repository.ExamPaperAnswerMapper;
import com.mindskip.xzs.repository.ExamPaperMapper;
@@ -349,4 +350,20 @@
map.put("examPeopleNum", examPeopleNum);
return map;
}
+
+ @Override
+ public Map<String, Object> data(ExamPaperDataVO examPaperDataVO) {
+ Map<String, Object> map = new HashMap<>();
+ // 闅忔満璇曞嵎
+ if (Objects.equals(examPaperDataVO.getType(), 7)) {
+ map.put("data", examPaperAnswerMapper.dataByTemplate(examPaperDataVO));
+ map.put("total", examPaperAnswerMapper.totalByTemplate(examPaperDataVO));
+ }
+ // 鏅�氳瘯鍗�
+ else {
+ map.put("data", examPaperAnswerMapper.dataByPaper(examPaperDataVO));
+ map.put("total", examPaperAnswerMapper.totalByPaper(examPaperDataVO));
+ }
+ return map;
+ }
}
--
Gitblit v1.8.0