From 29e064a60b78ae87d0479159089ffeb27f43833c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 19 Jan 2022 13:32:47 +0800
Subject: [PATCH] 新增考试查询统计
---
src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
index 0f9ce13..6b40853 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -33,6 +33,7 @@
import org.springblade.modules.exam.service.ExamPaperService;
import org.springblade.modules.exam.vo.ExamPaperSubjectVO;
import org.springblade.modules.exam.vo.ExamPaperVO;
+import org.springblade.modules.exam.vo.ExamStatisticsVO;
import org.springblade.modules.exam.vo.ExamSubjectChoicesVO;
import org.springblade.modules.exam.wrapper.ExamPaperWrapper;
import org.springblade.modules.system.entity.User;
@@ -240,12 +241,32 @@
/**
* 查询考生考试信息
- * @param userId 用户id
+ * @param examPaper 用户id
* @return
*/
- @GetMapping("/getExamDetail")
- public R getExamDetail(String userId){
- return R.data(examPaperService.getExamDetail(userId));
+ @PostMapping("/getExamDetail")
+ public R getExamDetail(@RequestBody ExamPaperVO examPaper){
+ System.out.println("examPaper = " + examPaper);
+ return R.data(examPaperService.getExamDetail(examPaper));
+ }
+
+ /**
+ * 考试名单确认
+ * @param
+ * @return
+ */
+ @PostMapping("/applyConfirm")
+ public R applyConfirm(@RequestBody ExamPaper exam) {
+ exam.setConfirmTime(new Date());
+ boolean status = examPaperService.updateById(exam);
+ //内网数据同步
+ String s1 =
+ "update ksxt_exam set confirm_user = " + "'" + exam.getConfirmUser()+ "'"
+ + ",confirm_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(exam.getConfirmTime())+ "'"
+ + " " +"where id = " + "'" + exam.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ //返回数据
+ return R.data(status);
}
@@ -398,6 +419,17 @@
return R.data(examPaperService.getExamRefreshInfo(examPaperVO));
}
+ /**
+ * 查询考试统计信息
+ * @param examPaperVO
+ * @return
+ */
+ @GetMapping("/getExamStatistics")
+ public R getExamStatistics(ExamPaperVO examPaperVO, Query query){
+ IPage<ExamStatisticsVO> pages = examPaperService.getExamStatistics(Condition.getPage(query), examPaperVO);
+ return R.data(pages);
+ }
+
}
--
Gitblit v1.9.3