From 99240e80f8cc18c1944bc9f5c7e48c47c751cd45 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 14:46:25 +0800
Subject: [PATCH] 培训报名考试申请后导入报名数据修改，保安公司查询接口修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 6185213..2a3789f 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -169,12 +169,15 @@
//修改保安报名状态
user.setIsTrain(2);
userService.updateById(user);
+
+ //数据同步
+ cancelTrainingRegistrationSync(trainingRegistration,user);
+
if (status){
return R.data(200,"取消报名成功");
}
- //数据同步
- cancelTrainingRegistrationSync(trainingRegistration,user);
+
}else {
return R.data(201,"尚未报名");
@@ -299,8 +302,8 @@
*/
@PostMapping("import-trainingRegistration")
@ApiOperation(value = "导入培训报名数据", notes = "传入excel")
- public R importUser(MultipartFile file, Integer isCovered) {
- TrainingRegistrationImporter trainingRegistrationImporter = new TrainingRegistrationImporter(trainingRegistrationService, false);
+ public R importUser(MultipartFile file, Integer isCovered,Long examId) {
+ TrainingRegistrationImporter trainingRegistrationImporter = new TrainingRegistrationImporter(trainingRegistrationService, false,examId);
ExcelUtil.save(file, trainingRegistrationImporter, TrainingRegistrationExcel.class);
return R.success("操作成功");
}
--
Gitblit v1.9.3