kimi
2020-03-24 b5636e416a2fe029f96aec6ddfd3489394925b15
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);
    }
}