From e262c9dd1b5f00b5f0ee4ea85a51a6e769c39590 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 09 Aug 2021 15:31:18 +0800
Subject: [PATCH] 1.现场检查
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index 39cfd29..a05660f 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -81,7 +81,7 @@
*/
@PostMapping("/update")
public R update(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
- arg.test01(arg.url+"/trainingRegistration/update",trainingRegistration);
+ //arg.test01(arg.url+"/trainingRegistration/update",trainingRegistration);
return R.status(trainingRegistrationService.updateById(trainingRegistration));
}
@@ -92,6 +92,11 @@
@PostMapping("/submit")
public R submit(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
if (null==trainingRegistration.getId()){
+ //查询是否已报名
+ Integer registration = trainingRegistrationService.getTrainingRegistrationInfo(trainingRegistration);
+ if (null!=registration){
+ return R.data(201,"已报名，不能重复报名");
+ }
trainingRegistration.setTrainingTime(new Date());
trainingRegistration.setCancel(1);
//默认报名未考试状态
@@ -102,7 +107,11 @@
// trainingRegistration.setApplyCode(getApplyCode(trainingRegistration));
}
// arg.test01(arg.url+"/trainingRegistration/submit",trainingRegistration);
- return R.status(trainingRegistrationService.saveOrUpdate(trainingRegistration));
+ boolean status = trainingRegistrationService.saveOrUpdate(trainingRegistration);
+ if (status){
+ return R.data(200,"报名成功");
+ }
+ return R.data(202,"报名失败");
}
/**
@@ -111,7 +120,7 @@
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
- arg.sendPostRemoveByIds(arg.url+"/trainingRegistration/remove",ids);
+ //arg.sendPostRemoveByIds(arg.url+"/trainingRegistration/remove",ids);
return R.status(trainingRegistrationService.removeByIds(Func.toLongList(ids)));
}
--
Gitblit v1.9.3