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 5a30aed5..88a26c51 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 @@ -44,6 +44,9 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/todoTaskList",method = RequestMethod.POST) List todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); + @RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST) + List todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery); + @RequestMapping(value = "/bat-wkflow/completeTask",method = RequestMethod.POST) Wrapper completeTaskByUserId(@RequestBody BusMes busMes); 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 6942a7c7..80c35fdd 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 @@ -64,6 +64,11 @@ public class workFlowFeignClientImpl { return mapWrapper; } + public List todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery){ + List mapWrapper = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); + return mapWrapper; + } + /** * 开始分页 * @param list 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 36a98550..134b17ab 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 @@ -280,6 +280,27 @@ public class WorkFlowController { return pageInfo; } + @ApiOperation(value = "我的待办任务列表") + @PostMapping("/todoTaskListNew") + public PageInfo todoTaskListNew(@RequestBody TaskCommonQuery taskCommonQuery){ + List busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); + List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); + PageInfo pageInfo= new PageInfo(); + if(busProcessNames!=null){ + pageInfo.setList(list1); + pageInfo.setPageNo(taskCommonQuery.getCurrent()); + pageInfo.setCount(Long.valueOf(busProcessNames.size())); + pageInfo.setPageSize(taskCommonQuery.getSize()); + }else{ + List list = new ArrayList<>(); + pageInfo.setList(list); + pageInfo.setPageNo(taskCommonQuery.getCurrent()); + pageInfo.setCount(Long.valueOf(0)); + pageInfo.setPageSize(taskCommonQuery.getSize()); + } + return pageInfo; + } + @ApiOperation(value = "完成任务") @PostMapping("/completeTask") public Wrapper completeTaskByUserId( BusMes busMes){