From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 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 3614e63..ccc8be1 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -86,7 +86,7 @@
@ApiOperation(value = "新增", notes = "传入trainingRegistration")
public R save(@RequestBody TrainingRegistration trainingRegistration){
//查询人员是否已报名
- User user = userService.getById(trainingRegistration.getUserId());
+ User user = userService.getUserById(trainingRegistration.getUserId());
if (null==user.getIsTrain()){
//已报名
trainingRegistration.setCancel(1);
@@ -170,7 +170,7 @@
+ "," +"'" + trainingRegistration.getAuditStatus() + "'" + ");" +
"update blade_user set is_train = " + user1.getIsTrain() + " " +"where id = " + "'" + user1.getId() + "'";
//FtpUtil.sqlFileUpload(sql);
- myAsyncService.FTP(sql);
+ myAsyncService.dataSync(sql);
}
@@ -181,7 +181,8 @@
@PostMapping("/cancelTrain")
public R cancelApply(@RequestBody TrainingRegistration trainingRegistration){
//查询人员是否已报名
- User user = userService.getById(trainingRegistration.getUserId());
+ User user = userService.getUserById(trainingRegistration.getUserId());
+
if(null==user.getIsTrain()){
trainingRegistration.setCancel(2);
boolean status = trainingRegistrationService.updateById(trainingRegistration);
@@ -224,7 +225,7 @@
@PostMapping("/auditSucess")
public R auditSucess(@RequestBody TrainingRegistration trainingRegistration){
//查询人员信息
- User user = userService.getById(trainingRegistration.getUserId());
+ User user = userService.getUserById(trainingRegistration.getUserId());
boolean status = false;
if (null!=user){
//修改为已报名状态
@@ -249,7 +250,7 @@
@PostMapping("/cancelTrainAudit")
public R cancelApplyAudit(@RequestBody TrainingRegistration trainingRegistration){
//查询人员是否已报名
- User user = userService.getById(trainingRegistration.getUserId());
+ User user = userService.getUserById(trainingRegistration.getUserId());
if(null==user.getIsTrain()){
trainingRegistration.setCancel(2);
trainingRegistration.setAuditStatus(2);
@@ -299,7 +300,7 @@
" " +"where id = " + "'" + trainingRegistration.getId() + "';" +
"update blade_user set is_train = " + user.getIsTrain() + " " +"where id = " + "'" + user.getId() + "'";
//FtpUtil.sqlFileUpload(s);
- myAsyncService.FTP(s);
+ myAsyncService.dataSync(s);
}
/**
@@ -315,7 +316,7 @@
// AtomicReference<StringBuilder> builder = new AtomicReference<>(new StringBuilder());
//遍历
list.forEach(userId ->{
- User user = userService.getById(userId);
+ User user = userService.getUserById(userId);
UserVO userVO = userService.getUserAgeById(Long.parseLong(userId));
//判断年龄
if (userVO.getAge()>=18 && userVO.getAge()<=60) {
@@ -633,7 +634,7 @@
"," + "'" + creatorTimeFormat +"'" +
"," +"'" + examPaper.getAuditStatus() + "'" + ")";
//FtpUtil.sqlFileUpload(s);
- myAsyncService.FTP(s);
+ myAsyncService.dataSync(s);
//修改报名信息
@@ -649,7 +650,7 @@
+ ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'"
+ " " + "where id = " + "'" + trainingRegistration.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
}
});
}
@@ -706,7 +707,7 @@
"," + "'" + creatorTimeFormat +"'" +
"," +"'" + examPaper.getAuditStatus() + "'" + ")";
//FtpUtil.sqlFileUpload(s);
- myAsyncService.FTP(s);
+ myAsyncService.dataSync(s);
//修改报名信息
list.forEach(id ->{
@@ -724,7 +725,7 @@
+ ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'"
+ " " + "where id = " + "'" + trainingRegistration.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
}
}
});
@@ -750,7 +751,7 @@
"update sys_training_registration set vip_status = " + "'" + trainingRegistration.getVipStatus() + "'"
+ " " + "where id = " + "'" + trainingRegistration.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
//更新并返回数据
return R.data(trainingRegistrationService.updateById(trainingRegistration));
}
@@ -778,7 +779,7 @@
"update sys_training_registration set vip_status = " + "'" + registration.getVipStatus() + "'"
+ " " + "where id = " + "'" + registration.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
//更新
trainingRegistrationService.updateById(registration);
}
--
Gitblit v1.9.3