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/action/ScoreController.java | 56 ++++++++++++++++++++++++++++
src/main/java/com/qxueyou/scc/admin/score/service/IScoreService.java | 12 +++++
src/main/java/com/qxueyou/scc/exam/dao/ExamResultVDao.java | 20 ++++++++++
src/main/java/com/qxueyou/scc/admin/score/service/impl/ScoreService.java | 23 +++++++++--
4 files changed, 105 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/score/action/ScoreController.java b/src/main/java/com/qxueyou/scc/admin/score/action/ScoreController.java
new file mode 100644
index 0000000..a587de3
--- /dev/null
+++ b/src/main/java/com/qxueyou/scc/admin/score/action/ScoreController.java
@@ -0,0 +1,56 @@
+package com.qxueyou.scc.admin.score.action;
+
+import com.qxueyou.scc.admin.score.model.Score;
+import com.qxueyou.scc.admin.score.service.impl.ScoreService;
+import com.qxueyou.scc.base.model.Pager;
+import com.qxueyou.scc.base.model.Result;
+import com.qxueyou.scc.base.util.CollectionUtils;
+import com.qxueyou.scc.base.util.QBeanUtils;
+import com.qxueyou.scc.exam.model.ExamBatchInfo;
+import com.qxueyou.scc.exam.model.ExamInfo;
+import com.qxueyou.scc.exam.model.ExamReExamPaper;
+import com.qxueyou.scc.exam.model.ExamResultV;
+import com.qxueyou.scc.exercise.model.ExerciseRecord;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "成绩管理接口")
+@Controller
+@CrossOrigin(origins="*",maxAge=3600)
+@RequestMapping(value = "admin/score")
+public class ScoreController {
+
+ // 分页查询中，默认记录条数和页数
+ private static final int DEFAULT_PAGE_SIZE = 10;
+ private static final int DEFAULT_PAGE_NUM = 2;
+
+ @Autowired
+ ScoreService scoreService;
+
+ @RequestMapping(value = "lstScore", method = RequestMethod.GET)
+ public @ResponseBody
+ Result list(String classId,Integer pageSize, Integer pageNum) {
+ pageSize = pageSize != null && pageSize > 0 ? pageSize : DEFAULT_PAGE_SIZE;
+ pageNum = pageNum != null && pageNum > 0 ? pageNum : DEFAULT_PAGE_NUM;
+ Pager pager = new Pager(pageSize,pageNum);
+ if(classId == null){
+ classId = "%";
+ }else {
+ classId += "%";
+ }
+ //总成绩数量
+ int totalCount = scoreService.findCount("from ExamResultV where class_Id Like ?",CollectionUtils.newList(classId));
+ pager.setTotalCount(totalCount);
+ List<ExamResultV> list = scoreService.allExamResultV(classId,pager);
+ return new Result(true,"success",CollectionUtils.newObjectMap("data", list, "scoreCount", totalCount));
+ }
+}
diff --git a/src/main/java/com/qxueyou/scc/admin/score/service/IScoreService.java b/src/main/java/com/qxueyou/scc/admin/score/service/IScoreService.java
index 6c4d33a..cab37de 100644
--- a/src/main/java/com/qxueyou/scc/admin/score/service/IScoreService.java
+++ b/src/main/java/com/qxueyou/scc/admin/score/service/IScoreService.java
@@ -1,5 +1,9 @@
package com.qxueyou.scc.admin.score.service;
+import com.qxueyou.scc.base.model.Pager;
+import com.qxueyou.scc.exam.model.ExamResultV;
+
+import java.util.List;
import java.util.Map;
public interface IScoreService {
@@ -10,7 +14,7 @@
* @return
*/
Map<String,Object> queryClassExamScoreInfo(String classId);
-
+
/**
* 获取班级作业成绩信息
* @param classId
@@ -18,4 +22,10 @@
*/
Map<String,Object> queryClassHomeworkScoreInfo(String classId);
+ /**
+ * 获取成绩信息
+ * @return
+ */
+ List<ExamResultV> allExamResultV(String classId, Pager page);
+
}
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);
+ }
+
+
}
diff --git a/src/main/java/com/qxueyou/scc/exam/dao/ExamResultVDao.java b/src/main/java/com/qxueyou/scc/exam/dao/ExamResultVDao.java
new file mode 100644
index 0000000..35b8e91
--- /dev/null
+++ b/src/main/java/com/qxueyou/scc/exam/dao/ExamResultVDao.java
@@ -0,0 +1,20 @@
+package com.qxueyou.scc.exam.dao;
+
+import com.qxueyou.scc.base.dao.BaseDAO;
+import com.qxueyou.scc.base.model.Pager;
+import com.qxueyou.scc.base.util.CollectionUtils;
+import com.qxueyou.scc.exam.model.ExamResultV;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class ExamResultVDao extends BaseDAO {
+
+ public List<ExamResultV> getResultList(String classId, Pager pager) {
+ String hql = "from ExamResultV where class_Id LIKE ?";
+ return this.findList(hql,pager,CollectionUtils.newList(classId),ExamResultV.class);
+ }
+
+
+}
--
Gitblit v1.8.0