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 f0340450..cc100ecb 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 @@ -355,6 +355,9 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/task/get_list_by_instance",method = RequestMethod.GET) List> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value = "sortWord", required = false) String sortWord, @RequestParam(value = "shunxu", required = false) String shunxu); + @RequestMapping(value = "/bat-wkflow/task/get_gather_by_instance",method = RequestMethod.GET) + List> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value = "sortWord", required = false) String sortWord, @RequestParam(value = "shunxu", required = false) String shunxu); + /** * @Author yuzhong * 获取图片 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 add2e314..32f71718 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 @@ -340,7 +340,9 @@ public class workFlowFeignClientImpl { public List> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ return workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu); } - + public List> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ + return workFlowFeignClient.get_gather_by_instance(prcNum,sortWord,shunxu); + } public byte[] getImg(@RequestParam("prcNum")String prcNum){ return workFlowFeignClient.getImg(prcNum); } 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 2099b410..12ec1abb 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 @@ -734,6 +734,12 @@ public class WorkFlowController { return workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu); } + @ApiOperation(value = "流程实例汇总列表") + @GetMapping("/get_gather_by_instance") + public List> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ + return workFlowFeignClient.get_gather_by_instance(prcNum,sortWord,shunxu); + } + @ApiOperation(value = "获取图片") @GetMapping("/getImg") public void getImg(@RequestParam("prcNum")String prcNum, HttpServletResponse response) throws IOException {