From 5bac93baf5659ce013163f884c9dce41990a860e Mon Sep 17 00:00:00 2001
From: kimi42345 <kimi42345@outlook.com>
Date: 星期一, 23 三月 2020 08:49:41 +0800
Subject: [PATCH] no message
---
src/main/java/com/highdatas/mdm/controller/ActivitiController.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/ActivitiController.java b/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
index 8cee716..19f8c24 100644
--- a/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
+++ b/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
@@ -66,6 +66,8 @@
IMaintainService maintainService;
@Autowired
ITUserService userService;
+ @Autowired
+ IMasterModifiedService masterModifiedService;
@Autowired
IMaintainFieldService maintainFieldService;
@@ -349,14 +351,8 @@
flows.setStatus(ActivitiStatus.close);
}
- if (flows.getBusinessType().equals(ActivitiBusinessType.maintain)){
- String maintainId = flows.getBusinessId();
- maintainService.dealFlow(maintainId, flows.getStatus());
- }
- if (flows.getBusinessType().equals(ActivitiBusinessType.field)){
- String maintainId = flows.getBusinessId();
- maintainFieldService.dealFlow(maintainId, flows.getStatus());
- }
+
+ flowsService.aduitFinish(flows);
} else {
if (pass && flows.getStatus().equals(ActivitiStatus.refuse)) {
@@ -386,4 +382,34 @@
return Result.success(CodeMsg.INSERT_ERROR);
}
}
+
+ @RequestMapping(value = "/addActUser")
+ public Result addActUser(@RequestParam String userId){
+ return identityService.addUser(userId);
+ }
+
+ @RequestMapping(value = "/addActRole")
+ public Result addActRole(@RequestParam String roleId){
+ return identityService.addRole(roleId);
+ }
+
+ @RequestMapping(value = "/addActUserRole")
+ public Result addActUserRole(@RequestParam String roleId, @RequestParam String userId){
+ return identityService.addUserRole(roleId,userId);
+ }
+ @RequestMapping(value = "/deleteActUserRole")
+ public Result deleteActUserRole(@RequestParam String roleId, @RequestParam String userId){
+ return identityService.deleteUserRole(roleId,userId);
+ }
+
+ @RequestMapping(value = "/deleteActRole")
+ public Result deleteActRole(@RequestParam String roleId){
+ return identityService.deleteRole(roleId);
+ }
+
+ @RequestMapping(value = "/deleteActUser")
+ public Result deleteActUser(@RequestParam String userId){
+ return identityService.deleteUser(userId);
+ }
+
}
--
Gitblit v1.8.0