From 1998d0e9a5cb8cb33a4680a56b221b701a28d947 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Dec 2021 11:55:34 +0800
Subject: [PATCH] 1. 新增考试时间到达后成绩计算接口 2. 修改个人考试查询接口，新增考试状态，成绩id,考试开始时间（防止考试中途关闭浏览器）
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 bcaf81c..6791a9b 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -12,6 +12,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.exam.entity.ExamPaper;
@@ -105,8 +106,17 @@
*/
@PostMapping("/saveExamScore")
public R saveExamScore(@RequestBody ExamScoreVO examScore) {
-
return R.status(examScoreService.saveExamScore(examScore));
+ }
+
+
+ /**
+ * 点击了开始考试后超过60分钟后再考试的，计算之前的考试成绩
+ * @param examScore 考试成绩信息对象
+ */
+ @GetMapping("/getExamScore")
+ public R getExamScore(ExamScoreVO examScore) {
+ return R.status(examScoreService.getExamScore(examScore));
}
@@ -310,7 +320,7 @@
examScoreExcel.setExamName("2021年10月**日保安员证培训考试");
examScoreExcel.setName("张三");
examScoreExcel.setIdCardNo("360XXX19XXXXXX****");
- examScoreExcel.setCandidateNo("2110**m0001");
+// examScoreExcel.setCandidateNo("2110**m0001");
examScoreExcel.setLearnGrade(80);
list.add(examScoreExcel);
@@ -318,7 +328,7 @@
examScoreExcel1.setExamName("2021年10月**日保安员证培训考试");
examScoreExcel1.setName("李四");
examScoreExcel1.setIdCardNo("360XXX19XXXXXX****");
- examScoreExcel1.setCandidateNo("2110**m0002");
+// examScoreExcel1.setCandidateNo("2110**m0002");
examScoreExcel1.setLearnGrade(88);
list.add(examScoreExcel1);
// ExcelUtil.export(response, "实操成绩数据模板", "实操成绩数据表", list, ExamScoreExcel.class);
@@ -326,7 +336,7 @@
try {
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding(org.apache.commons.codec.Charsets.UTF_8.name());
- fileName = URLEncoder.encode("实操成绩数据模板", Charsets.UTF_8.name());
+ fileName = URLEncoder.encode("实操成绩数据模板"+ DateUtil.time(), Charsets.UTF_8.name());
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
//修改单元格格式为文本格式
EasyExcel.write(response.getOutputStream(), ExamScoreExcel.class).sheet("实操成绩数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
@@ -420,7 +430,7 @@
//按条件查询成绩数据
List<ExportExamScoreExcel> examScoreExcels = examScoreService.exportExamScoreList(examScoreVO);
//导出成绩集合数据
- ExcelUtil.export(response, "成绩数据", "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
+ ExcelUtil.export(response, "成绩数据"+DateUtil.time(), "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
}
/**
--
Gitblit v1.9.3