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/accreditation/controller/AccreditationRecordsController.java | 102 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 64 insertions(+), 38 deletions(-)
diff --git a/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java b/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java
index 668f2bb..57a731d 100644
--- a/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java
+++ b/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java
@@ -29,6 +29,7 @@
import org.springblade.modules.accreditation.entity.AccreditationRecords;
import org.springblade.modules.accreditation.service.AccreditationRecordsService;
import org.springblade.modules.accreditation.vo.AccreditationRecordsVo;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.web.bind.annotation.*;
@@ -56,7 +57,7 @@
private final AccreditationRecordsService accreditationRecordsService;
private final IUserService userService;
-
+ private final MyAsyncService myAsyncService;
/**
* 自定义分页
@@ -101,7 +102,8 @@
"update blade_user set user_type = " + "'" + user.getUserType() + "'" +
",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
" " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
return R.data(save);
}
@@ -140,22 +142,35 @@
//修改为未制证状态
AccreditationRecords records = accreditationRecordsService.getById(accreditationRecords);
User user = userService.getById(records.getUserId());
- user.setUserType(7);
- user.setUpdateTime(new Date());
- //更新
- userService.updateById(user);
+ if(accreditationRecords.getType()==2) {
+ user.setUserType(7);
+ user.setUpdateTime(new Date());
+ //更新
+ userService.updateById(user);
- //内网同步
- String s =
- "update sys_accreditation_records set audit_status = " + accreditationRecords.getAuditStatus() + "" +
- ",audit_detail = " + accreditationRecords.getAuditDetail() + "" +
- ",audit_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(accreditationRecords.getAuditTime()) + "" +
- ",audit_user = " + accreditationRecords.getAuditUser() + " " +
- "where id = " + "'" + accreditationRecords.getId() + "';" +
- "update blade_user set user_type = " + user.getUserType() + "" +
- ",update_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "" +
- "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s);
+ //内网同步
+ String s =
+ "update sys_accreditation_records set audit_status = " + accreditationRecords.getAuditStatus() + "" +
+ ",audit_detail = " + accreditationRecords.getAuditDetail() + "" +
+ ",audit_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(accreditationRecords.getAuditTime()) + "" +
+ ",audit_user = " + accreditationRecords.getAuditUser() + " " +
+ "where id = " + "'" + accreditationRecords.getId() + "';" +
+ "update blade_user set user_type = " + user.getUserType() + "" +
+ ",update_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "" +
+ "where id = " + "'" + user.getId() + "'";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
+ }else {
+ //内网同步
+ String s =
+ "update sys_accreditation_records set audit_status = " + accreditationRecords.getAuditStatus() + "" +
+ ",audit_detail = " + accreditationRecords.getAuditDetail() + "" +
+ ",audit_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(accreditationRecords.getAuditTime()) + "" +
+ ",audit_user = " + accreditationRecords.getAuditUser() + " " +
+ "where id = " + "'" + accreditationRecords.getId() + "'";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
+ }
}else {
//内网同步
String s =
@@ -164,7 +179,7 @@
",audit_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(accreditationRecords.getAuditTime()) + "" +
",audit_user = " + accreditationRecords.getAuditUser() + " " +
"where id = " + "'" + accreditationRecords.getId() + "'";
- FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
}
//返回
return R.status(b);
@@ -187,25 +202,36 @@
accreditationRecordsService.updateById(accreditationRecords);
//审核通过
if (accreditationRecords.getAuditStatus()==2){
- //修改为未制证状态
- AccreditationRecords records = accreditationRecordsService.getById(id);
- User user = userService.getById(records.getUserId());
- user.setUserType(7);
- user.setUpdateTime(new Date());
- //更新
- userService.updateById(user);
+ if (accreditationRecords.getType()==2) {
+ //修改为未制证状态
+ AccreditationRecords records = accreditationRecordsService.getById(id);
+ User user = userService.getById(records.getUserId());
+ user.setUserType(7);
+ user.setUpdateTime(new Date());
+ //更新
+ userService.updateById(user);
- //内网同步
- String s =
- "update sys_accreditation_records set audit_status = " + accreditationRecords.getAuditStatus() + "" +
- ",audit_detail = " + accreditationRecords.getAuditDetail() + "" +
- ",audit_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(accreditationRecords.getAuditTime()) + "" +
- ",audit_user = " + accreditationRecords.getAuditUser() + " " +
- "where id = " + "'" + accreditationRecords.getId() + "';" +
- "update blade_user set user_type = " + user.getUserType() + "" +
- ",update_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "" +
- "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s);
+ //内网同步
+ String s =
+ "update sys_accreditation_records set audit_status = " + accreditationRecords.getAuditStatus() + "" +
+ ",audit_detail = " + accreditationRecords.getAuditDetail() + "" +
+ ",audit_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(accreditationRecords.getAuditTime()) + "" +
+ ",audit_user = " + accreditationRecords.getAuditUser() + " " +
+ "where id = " + "'" + accreditationRecords.getId() + "';" +
+ "update blade_user set user_type = " + user.getUserType() + "" +
+ ",update_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "" +
+ "where id = " + "'" + user.getId() + "'";
+ myAsyncService.dataSync(s);
+ }else {
+ //内网同步
+ String s =
+ "update sys_accreditation_records set audit_status = " + accreditationRecords.getAuditStatus() + "" +
+ ",audit_detail = " + accreditationRecords.getAuditDetail() + "" +
+ ",audit_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(accreditationRecords.getAuditTime()) + "" +
+ ",audit_user = " + accreditationRecords.getAuditUser() + " " +
+ "where id = " + "'" + accreditationRecords.getId() + "'";
+ myAsyncService.dataSync(s);
+ }
}else {
//内网同步
String s =
@@ -214,7 +240,7 @@
",audit_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(accreditationRecords.getAuditTime()) + "" +
",audit_user = " + accreditationRecords.getAuditUser() + " " +
"where id = " + "'" + accreditationRecords.getId() + "'";
- FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
}
});
//返回
@@ -273,7 +299,7 @@
}
/**
- * 导出保安员证信息
+ * 导出保安员证信息（上岗证）
*/
@GetMapping("export-security-paper")
public void exportSecurityPaper(AccreditationRecordsVo accreditationRecords, HttpServletResponse response) throws IOException {
--
Gitblit v1.9.3