From cb04ed62736efe70cf5babe534220b4ae4c1ca67 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 20 Jan 2022 21:08:42 +0800
Subject: [PATCH] 1. 定时任务调整 2. 成绩修改审核通过修改状态调整 3. 考试统计查询修改

---
 src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 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 fa60f2e..a1099f3 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -25,6 +25,7 @@
 import org.springblade.modules.exam.util.SecurityPaperUtil;
 import org.springblade.modules.exam.vo.ExamScoreVO;
 import org.springblade.modules.exam.vo.UpdateParamVo;
+import org.springblade.modules.information.vo.InformationVO;
 import org.springblade.modules.securitypaper.entity.SecurityPaper;
 import org.springblade.modules.securitypaper.service.SecurityPaperService;
 import org.springblade.modules.system.entity.User;
@@ -418,8 +419,8 @@
 	 * @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,ExamScoreVO examScore) {
+		IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query),examScore);
 		return R.data(pages);
 	}
 
@@ -464,4 +465,25 @@
 	public R refreshTrainExamScore() {
 		return R.status(examScoreService.refreshTrainExamScore());
 	}
+
+	/**
+	 * 考试情况统计,按月统计各个培训学校考试合格人数和不合格人数
+	 * @param
+	 */
+	@GetMapping("/getExamStatisInfo")
+	public R getExamStatisInfo(InformationVO information) {
+		return R.data(examScoreService.getExamStatisInfo(information));
+	}
+
+	/**
+	 * 获取当前时间
+	 * @param
+	 */
+	@GetMapping("/getNowDate")
+	public R getNowDate() {
+		return R.data(System.currentTimeMillis());
+	}
+
+
+
 }

--
Gitblit v1.9.3