From efb51d5e1f6625ac528bdedb572435dfd788c603 Mon Sep 17 00:00:00 2001
From: 胡仁荣 <897853850@qq.com>
Date: 星期四, 03 十一月 2022 10:47:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/admin/score/service/impl/ScoreService.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/score/service/impl/ScoreService.java b/src/main/java/com/qxueyou/scc/admin/score/service/impl/ScoreService.java
index db5c2c9..51a83bb 100644
--- a/src/main/java/com/qxueyou/scc/admin/score/service/impl/ScoreService.java
+++ b/src/main/java/com/qxueyou/scc/admin/score/service/impl/ScoreService.java
@@ -1,7 +1,11 @@
package com.qxueyou.scc.admin.score.service.impl;
+import java.util.List;
import java.util.Map;
+import com.qxueyou.scc.base.model.Pager;
+import com.qxueyou.scc.exam.dao.ExamResultVDao;
+import com.qxueyou.scc.exam.model.ExamResultV;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -13,28 +17,31 @@
@Service
public class ScoreService extends CommonAppService implements IScoreService {
-
+
@Autowired
HomeworkScoreVDAO homeworkDao;
-
+
@Autowired
ExamScoreVDAO examDao;
+ @Autowired
+ ExamResultVDao examResultVDao;
+
@Override
public Map<String,Object> queryClassExamScoreInfo(String classId) {
-
+
return CollectionUtils.newObjectMap(
"examCount",examDao.getExamCount(classId),
"examHasAuditCount",examDao.getExamCount(classId),
"examToAuditCount",0,
"examNoSubmitCount",examDao.getToSubmitExamCount(classId)
);
-
+
}
@Override
public Map<String,Object> queryClassHomeworkScoreInfo(String classId) {
-
+
return CollectionUtils.newObjectMap(
"homeworkCount",homeworkDao.getHomeworkCount(classId),
"homeworkHasAuditCount",homeworkDao.getHomeworkHasAuditCount(classId),
@@ -43,4 +50,10 @@
);
}
+ @Override
+ public List<ExamResultV> allExamResultV(String classId, Pager page) {
+ return examResultVDao.getResultList(classId,page);
+ }
+
+
}
--
Gitblit v1.8.0