From 7f36a55767f870937a473f9c0eebf0240300a5ef Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Jun 2022 22:07:21 +0800
Subject: [PATCH] ftp 个人保安新增修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 7 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 310b423..f797524 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -329,7 +329,7 @@
//调用ftp获取返回数据
while (true){
try {
- Thread.sleep(1000);
+ Thread.sleep(3000);
} catch (InterruptedException e) {
e.printStackTrace();
}
@@ -339,12 +339,12 @@
if (result.getCode() == 200) {
break;
}
-// else {
-// count++;
-// if (count == 30) {
-// break;
-// }
-// }
+ else {
+ count++;
+ if (count == 90) {
+ break;
+ }
+ }
}
//创建集合，存年龄符合要求
@@ -430,6 +430,67 @@
}
/**
+ * 批量报名
+ * @param trainingRegistration 考试报名信息对象
+ */
+ @PostMapping("/batchTrains")
+ public R batchApplys(@RequestBody TrainingRegistrationVo trainingRegistration){
+ List<String> list = Arrays.asList(trainingRegistration.getUserIds().split(","));
+
+ if (list.size()>0) {
+ //遍历
+ list.forEach(userId -> {
+ User user = userService.getUserById(userId);
+ //未报名的新增，已报名的不做处理
+ if (null == user.getIsTrain()) {
+ TrainingRegistration trainingRegistration1 = new TrainingRegistration();
+ trainingRegistration1.setCancel(1);
+ //默认为未考试状态
+ trainingRegistration1.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration1.setAuditStatus(4);
+ trainingRegistration1.setTrainingTime(new Date());
+ trainingRegistration1.setUserId(userId);
+ trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
+ trainingRegistrationService.save(trainingRegistration1);
+ //修改保安报名状态
+ user.setIsTrain(1);
+ userService.updateById(user);
+
+ //数据同步
+ saveTrainingRegistration(trainingRegistration1, user);
+ } else {
+ if (user.getIsTrain() != 1) {
+ TrainingRegistration trainingRegistration1 = new TrainingRegistration();
+ trainingRegistration1.setCancel(1);
+ //默认为未考试状态
+ trainingRegistration1.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration1.setAuditStatus(4);
+ trainingRegistration1.setTrainingTime(new Date());
+ trainingRegistration1.setUserId(userId);
+ trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
+ trainingRegistrationService.save(trainingRegistration1);
+ //修改保安报名状态
+ user.setIsTrain(1);
+ userService.updateById(user);
+
+ //数据同步
+ saveTrainingRegistration(trainingRegistration1, user);
+ }
+ }
+ });
+ }
+
+ //如果存在年龄不符的，则抛出异常
+// if (number.get()>0){
+// String errorAccount = StringUtils.join(errorList, "\\\n");
+// throw new ServiceException("保安员:[" + errorAccount + "]报名失败!年龄不符,报名年龄为[18-60]周岁!");
+// }
+ return R.data(200,"报名成功");
+ }
+
+ /**
* 修改
* @param trainingRegistration 报名培训信息对象
*/
--
Gitblit v1.9.3