From 8ca64d03d58db959d95f49119be0cb322d6edf2f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Jul 2021 17:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/training/controller/TrainExamController.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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 f4a8ea7..1698b93 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
@@ -47,7 +47,8 @@
 	 */
 	@PostMapping("/save")
 	@ApiOperation(value = "新增", notes = "传入trainExam")
-	public R save(@RequestBody TrainExam trainExam) {
+	public R save(@RequestBody TrainExam trainExam) throws Exception {
+		arg.test01(arg.url+"/trainExam/save",trainExam);
 		return R.status(trainExamService.save(trainExam));
 	}
 
@@ -56,7 +57,19 @@
 	 * @param trainExam 报名培训申请信息对象
 	 */
 	@PostMapping("/update")
-	public R update(@RequestBody TrainExam trainExam) {
+	public R update(@RequestBody TrainExam trainExam) throws Exception {
+		arg.test01(arg.url+"/trainExam/update",trainExam);
+		return R.status(trainExamService.updateById(trainExam));
+	}
+
+	/**
+	 * 审核修改
+	 * @param trainExam 报名培训申请信息对象
+	 */
+	@PostMapping("/update-audit")
+	public R updateAudit(@RequestBody TrainExam trainExam) throws Exception {
+		trainExam.setAuditTime(new Date());
+		arg.test01(arg.url+"/trainExam/update",trainExam);
 		return R.status(trainExamService.updateById(trainExam));
 	}
 
@@ -80,6 +93,7 @@
 	 */
 	@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)));
 	}
 

--
Gitblit v1.9.3