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 677f46ea..73d35ca2 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 @@ -85,9 +85,12 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/hastodoTasksList",method = RequestMethod.POST) Wrapper> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); - @RequestMapping(value = "/bat-wkflow/todoTaskListShow",method = RequestMethod.POST) + @RequestMapping(value = "/bat-wkflow/todoTaskList",method = RequestMethod.POST) List todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); + @RequestMapping(value = "/bat-wkflow/todoTaskListShow",method = RequestMethod.POST) + List todoTaskListByUserIdInfo(@RequestBody TaskCommonQuery taskCommonQuery); + @RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST) List todoTaskListByUserIdNew(@RequestBody TaskCommonQuery 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 79652be7..1472afb6 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 @@ -473,4 +473,9 @@ public class workFlowFeignClientImpl { public String endPrcName(String prcName,String esId) { return workFlowFeignClient.endPrcName(prcName,esId); } + + public List todoTaskListByUserIdInfo(TaskCommonQuery taskCommonQuery) { + List mapWrapper = workFlowFeignClient.todoTaskListByUserIdInfo(taskCommonQuery); + return mapWrapper; + } } 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 d686b676..fa6e0c0e 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 @@ -532,7 +532,7 @@ public class WorkFlowController extends BaseController { @ApiOperation(value = "我的待办任务列表") @PostMapping("/todoTaskList") public PageInfo todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery) { - List busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); + List busProcessNames = workFlowFeignClient.todoTaskListByUserIdInfo(taskCommonQuery); List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); PageInfo pageInfo = new PageInfo(); if (busProcessNames != null) {