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 2f44b18d..f4f0dd54 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 @@ -285,12 +285,12 @@ public interface workFlowFeignClient { BusProcessName queryTaskFirst(@RequestParam("bpnId") String bpnId); /** - * 查询指定任务index + * 查询指定任务 * @param prcId * @return */ @RequestMapping(value = "/bat-wkflow/queryTaskIndex",method = RequestMethod.GET) - BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId); + BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId,@RequestParam("taskIds") String taskIds); /** * 查询草稿 * @param taskCommonQuery 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 a6397232..eda8627b 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 @@ -303,8 +303,8 @@ public class workFlowFeignClientImpl { public BusProcessName queryTaskFirst(@RequestParam("bpnId")String bpnId){ return workFlowFeignClient.queryTaskFirst(bpnId); } - public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId){ - return workFlowFeignClient.queryTaskIndex(prcId); + public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId,@RequestParam("taskIds") String taskIds){ + return workFlowFeignClient.queryTaskIndex(prcId,taskIds); } public List queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery){ 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 f47d9c03..1534ff4a 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 @@ -619,12 +619,10 @@ public class WorkFlowController { return workFlowFeignClient.queryTaskFirst(bpnId); } - @ApiOperation(value = "查询任务第index步") + @ApiOperation(value = "查询taskid任务") @GetMapping("/queryTaskIndex") - public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId){ - BusProcessNew busProcessNew = workFlowFeignClient.queryTaskIndex(prcId); - return busProcessNew; - + public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId,@RequestParam("taskIds") String taskIds){ + return workFlowFeignClient.queryTaskIndex(prcId,taskIds); } @ApiOperation(value = "查询草稿")