From d4e35652a8a879c9e53016eeb1e3e9018c716502 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 12 Aug 2021 10:08:55 +0800
Subject: [PATCH] 用户新增字段是否培训报名，培训公司查询接口修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 9 +++------
1 files changed, 3 insertions(+), 6 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 55c4fdd..65455cb 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,6 @@
*/
@PostMapping("/update")
public R update(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
- arg.test01(arg.url+"/trainingRegistration/update",trainingRegistration);
return R.status(trainingRegistrationService.updateById(trainingRegistration));
}
@@ -94,19 +93,18 @@
if (null==trainingRegistration.getId()){
//查询是否已报名
Integer registration = trainingRegistrationService.getTrainingRegistrationInfo(trainingRegistration);
- if (null==registration){
+ if (null!=registration){
return R.data(201,"已报名，不能重复报名");
}
trainingRegistration.setTrainingTime(new Date());
trainingRegistration.setCancel(1);
//默认报名未考试状态
- trainingRegistration.setIsExam(1);
+// trainingRegistration.setIsExam(1);
//去生成准考证号码
- trainingRegistration.setCandidateNo(getCandidateNo(trainingRegistration));
+// trainingRegistration.setCandidateNo(getCandidateNo(trainingRegistration));
//去生成考试编号
// trainingRegistration.setApplyCode(getApplyCode(trainingRegistration));
}
-// arg.test01(arg.url+"/trainingRegistration/submit",trainingRegistration);
boolean status = trainingRegistrationService.saveOrUpdate(trainingRegistration);
if (status){
return R.data(200,"报名成功");
@@ -120,7 +118,6 @@
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
- arg.sendPostRemoveByIds(arg.url+"/trainingRegistration/remove",ids);
return R.status(trainingRegistrationService.removeByIds(Func.toLongList(ids)));
}
--
Gitblit v1.9.3