diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index ab26227f..1f1e8fa7 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -56,6 +56,9 @@ public interface workFlowFeignClient { @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/esPrcRelation/judgeAcceptTask",method = RequestMethod.GET) + Boolean judgeAcceptTask(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk); + @RequestMapping(value = "/bat-wkflow/task/get_verify_by_instance",method = RequestMethod.GET) Map get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index f0caf3ae..23e9ba94 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -85,6 +85,11 @@ public class workFlowFeignClientImpl { return integerWrapper; } + public Boolean judgeAcceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk){ + Boolean booleanWrapper = workFlowFeignClient.judgeAcceptTask(nowEsId,oaFlag,prcIdGk); + return booleanWrapper; + } + public Map get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ Map stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,pId); return stringWrapper; diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index d0f604ae..889b9a87 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -249,6 +249,12 @@ public class WorkFlowController { return workFlowFeignClient.acceptTack(nowEsId,oaFlag,taskId); } + @ApiOperation(value = "管控流程判断接收任务") + @GetMapping("/judgeAcceptTack") + public ResponseMessage judgeAcceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk) { + return Result.success(workFlowFeignClient.judgeAcceptTack(nowEsId,oaFlag,prcIdGk)); + } + @ApiOperation(value = "流程实例明细验证是否完成") @GetMapping("/get_verify_by_instance") public Map activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){