From 045b55722b25ccc77d88671c5d6df309edb8a66d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 16:00:34 +0800
Subject: [PATCH] 1. 保安员新增异步推送数据至群访用户表 2. 会员标记接口新增,会员标记成功,则创建会员记录和会员题库记录(包含120道题目) 3. web 端考试开始,查询题目判断用户是否为会员,如果为会员则从会员题库获取当前人员的考试题目(从120道题中随机抽取60道)
---
src/main/java/org/springblade/modules/training/controller/TrainExamController.java | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/controller/TrainExamController.java b/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
index fe26b10..e33dae8 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
@@ -9,12 +9,18 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.apply.entity.ExamPayment;
+import org.springblade.modules.apply.service.ExamPaymentService;
import org.springblade.modules.exam.entity.ExamPaper;
+import org.springblade.modules.exam.entity.ExamScore;
+import org.springblade.modules.exam.service.ExamPaperService;
import org.springblade.modules.training.entity.TrainExam;
import org.springblade.modules.training.service.TrainExamService;
import org.springblade.modules.training.vo.TrainExamVo;
import org.springframework.web.bind.annotation.*;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -29,6 +35,8 @@
public class TrainExamController {
private final TrainExamService trainExamService;
+
+ private final ExamPaperService examPaperService;
/**
* 自定义分页
@@ -47,7 +55,7 @@
*/
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入trainExam")
- public R save(@RequestBody TrainExam trainExam) {
+ public R save(@RequestBody TrainExam trainExam) throws Exception {
return R.status(trainExamService.save(trainExam));
}
@@ -56,7 +64,40 @@
* @param trainExam 报名培训申请信息对象
*/
@PostMapping("/update")
- public R update(@RequestBody TrainExam trainExam) {
+ public R update(@RequestBody TrainExam trainExam) throws Exception {
+ return R.status(trainExamService.updateById(trainExam));
+ }
+
+ /**
+ * 审核修改
+ * @param trainExam 报名培训申请信息对象
+ */
+ @PostMapping("/update-audit")
+ public R updateAudit(@RequestBody TrainExam trainExam) throws Exception {
+ trainExam.setAuditTime(new Date());
+ //审核通过，插入一条考试信息
+ if (trainExam.getAuditStatus()==1){
+ //查询考试申请
+ TrainExam exam = trainExamService.getById(trainExam.getId());
+ //如果已通过申请，则修改后返回
+ if (exam.getAuditStatus()==1){
+ return R.status(trainExamService.updateById(trainExam));
+ }
+ ExamPaper examPaper = new ExamPaper();
+ examPaper.setTrainExamId(trainExam.getId());
+ examPaper.setExamName(trainExam.getTrainExamName());
+ examPaper.setStartTime(trainExam.getStartTime());
+ examPaper.setEndTime(trainExam.getEndTime());
+ examPaper.setCreatorDate(new Date());
+ //区间时间
+ String start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(trainExam.getStartTime());
+ String end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(trainExam.getEndTime());
+ String examTime = "[\"" +start+ "\""+","+"\"" +end+ "\"]";
+ examPaper.setExamTime(examTime);
+ //1:正式考试 2:模拟考试
+ examPaper.setExamType(2);
+ examPaperService.save(examPaper);
+ }
return R.status(trainExamService.updateById(trainExam));
}
@@ -70,7 +111,6 @@
trainExam.setCreateTime(new Date());
trainExam.setAuditStatus(3);
}
- arg.test01(arg.url+"/trainExam/submit",trainExam);
return R.status(trainExamService.saveOrUpdate(trainExam));
}
@@ -80,7 +120,6 @@
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
- arg.sendPostRemoveByIds(arg.url+"/trainExam/remove",ids);
return R.status(trainExamService.removeByIds(Func.toLongList(ids)));
}
@@ -101,9 +140,8 @@
* @return
*/
@GetMapping("/page-tree")
- public R pageTree(TrainExam trainExam) {
- List<TrainExam> pages = trainExamService.selectTrainExamPageTree(trainExam);
- return R.data(pages);
+ public List<TrainExam> pageTree(TrainExam trainExam) {
+ return trainExamService.selectTrainExamPageTree(trainExam);
}
}
--
Gitblit v1.9.3