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 | 11 ++---------
1 files changed, 2 insertions(+), 9 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 37c6901..e33dae8 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
@@ -56,7 +56,6 @@
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入trainExam")
public R save(@RequestBody TrainExam trainExam) throws Exception {
- arg.test01(arg.url+"/trainExam/save",trainExam);
return R.status(trainExamService.save(trainExam));
}
@@ -66,7 +65,6 @@
*/
@PostMapping("/update")
public R update(@RequestBody TrainExam trainExam) throws Exception {
- arg.test01(arg.url+"/trainExam/update",trainExam);
return R.status(trainExamService.updateById(trainExam));
}
@@ -77,8 +75,6 @@
@PostMapping("/update-audit")
public R updateAudit(@RequestBody TrainExam trainExam) throws Exception {
trainExam.setAuditTime(new Date());
- //内网数据同步
- arg.test01(arg.url+"/trainExam/update-audit",trainExam);
//审核通过，插入一条考试信息
if (trainExam.getAuditStatus()==1){
//查询考试申请
@@ -115,7 +111,6 @@
trainExam.setCreateTime(new Date());
trainExam.setAuditStatus(3);
}
- arg.test01(arg.url+"/trainExam/submit",trainExam);
return R.status(trainExamService.saveOrUpdate(trainExam));
}
@@ -125,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)));
}
@@ -146,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