From 2fdf30b77e0614f4785c7893a01958e8c8db8545 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 04 Dec 2021 16:26:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
index 20d7f6e..a3b6246 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -336,13 +336,26 @@
}
/**
+ * 考试合格人数对比统计
+ */
+ @GetMapping("score-stat")
+ @ApiOperation(value = "分数统计")
+ public R scoreStat(HttpServletResponse response, String deptid, String jurisdiction) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ List<Object> mapList = examScoreService.scoreStat(deptid, jurisdiction);
+ return R.data(mapList);
+ }
+
+ /**
* 自定义分页
*
* @param query page,size
*/
@GetMapping("/score-page")
- public R<IPage<ExamScoreVO>> scorePage(Query query, String deptid, String jurisdiction) {
- IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query),deptid,jurisdiction);
+ public R<IPage<ExamScoreVO>> scorePage(Query query, String deptid, String jurisdiction,String realName) {
+ IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query),deptid,jurisdiction,realName);
return R.data(pages);
}
--
Gitblit v1.9.3