Răsfoiți Sursa

市场管理:取回操作添加回调地址参数

baichengfei 4 ani în urmă
părinte
comite
afb6cbb05b

+ 2 - 1
src/main/java/com/common/workflow/service/activiti/ActivitiService.java

@@ -798,7 +798,7 @@ public class ActivitiService {
     }
 
     @Transactional
-    public void returnAssignNode(String processKey, String businessKey, String proInstanceId, String curUserId, String createUserId) {
+    public void returnAssignNode(String processKey, String businessKey, String proInstanceId, String curUserId, String createUserId, String callBackUrl) {
 
         Task task = taskService.createTaskQuery()
             .processDefinitionKey(processKey)
@@ -877,6 +877,7 @@ public class ActivitiService {
         currentVariables.put("businessKey", businessKey);
         currentVariables.put("users", curUserId);
         currentVariables.put("remarks", "上级单位撤回");
+        currentVariables.put("callbackUrl", callBackUrl);
 
         //完成任务
         taskService.complete(task.getId(),currentVariables);

+ 1 - 1
src/main/java/com/common/workflow/web/rest/ActivitiResource.java

@@ -162,7 +162,7 @@ public class ActivitiResource {
         if (StringUtils.isEmpty(rbVm.getApiSecret()) || !rbVm.getApiSecret().equals("rb2vm-sc0gl#21")) {
             return ResponseEntity.ok(rbVm.getBusinessKey());
         }
-        activitiService.returnAssignNode(rbVm.getProcessKey(), rbVm.getBusinessKey(), rbVm.getProcessInstanceId(), rbVm.getCurUserId(), rbVm.getCreateUserId());
+        activitiService.returnAssignNode(rbVm.getProcessKey(), rbVm.getBusinessKey(), rbVm.getProcessInstanceId(), rbVm.getCurUserId(), rbVm.getCreateUserId(), rbVm.getCallBackUrl());
         return ResponseEntity.ok(rbVm.getBusinessKey());
     }
 

+ 12 - 0
src/main/java/com/common/workflow/web/rest/vm/RollBackPreviousNodeVM.java

@@ -21,6 +21,10 @@ public class RollBackPreviousNodeVM {
      * 流程id
      */
     private String processInstanceId;
+    /**
+     * 回调Api地址
+     */
+    private String callBackUrl;
     /**
      * 接口验签
      */
@@ -73,4 +77,12 @@ public class RollBackPreviousNodeVM {
     public void setApiSecret(String apiSecret) {
         this.apiSecret = apiSecret;
     }
+
+    public String getCallBackUrl() {
+        return callBackUrl;
+    }
+
+    public void setCallBackUrl(String callBackUrl) {
+        this.callBackUrl = callBackUrl;
+    }
 }