174-OA待办修改

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -53,6 +53,9 @@ public interface workFlowFeignClient {
     @RequestMapping(value = "/bat-wkflow/oaTaskExec/execTask",method = RequestMethod.GET)
     Map<String,Object> execTask(@RequestParam("todoId") String todoId);
 
+    @RequestMapping(value = "/bat-wkflow/esPrcRelation/acceptTask",method = RequestMethod.GET)
+    Integer acceptTask(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId);
+
     @RequestMapping(value = "/bat-wkflow/task/get_verify_by_instance",method = RequestMethod.GET)
     Map<String,Object> get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId);
 

adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java

@@ -80,6 +80,11 @@ public class workFlowFeignClientImpl {
         return stringWrapper;
     }
 
+    public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId){
+        Integer integerWrapper = workFlowFeignClient.acceptTask(nowEsId,oaFlag,taskId);
+        return integerWrapper;
+    }
+
     public Map<String,Object> get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){
         Map<String,Object> stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,pId);
         return stringWrapper;

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

@@ -243,6 +243,12 @@ public class WorkFlowController {
         return  workFlowFeignClient.execTask(todoId);
     }
 
+    @ApiOperation(value = "管控流程接收任务")
+    @GetMapping("/acceptTack")
+    public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId) {
+        return workFlowFeignClient.acceptTack(nowEsId,oaFlag,taskId);
+    }
+
     @ApiOperation(value = "流程实例明细验证是否完成")
     @GetMapping("/get_verify_by_instance")
     public Map<String,Object> activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){