From de34688afc76e7da321d672e96a947fafced3726 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Mon, 15 May 2023 14:54:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=20=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=B8=8E=20=E9=A6=96=E9=A1=B5=E5=BE=85=E5=8A=9E=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/FeignClient/workFlowFeignClient.java     | 5 ++++-
 .../com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java  | 5 +++++
 .../com/adc/da/workFlow/controller/WorkFlowController.java   | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

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<Map<String, Object>> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery);
 
-    @RequestMapping(value = "/bat-wkflow/todoTaskListShow",method = RequestMethod.POST)
+    @RequestMapping(value = "/bat-wkflow/todoTaskList",method = RequestMethod.POST)
     List<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery);
 
+    @RequestMapping(value = "/bat-wkflow/todoTaskListShow",method = RequestMethod.POST)
+    List<BusProcessName> todoTaskListByUserIdInfo(@RequestBody TaskCommonQuery taskCommonQuery);
+
     @RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST)
     List<BusProcessName> 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<BusProcessName> todoTaskListByUserIdInfo(TaskCommonQuery taskCommonQuery) {
+        List<BusProcessName> 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<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery) {
-        List<BusProcessName> busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery);
+        List<BusProcessName> busProcessNames = workFlowFeignClient.todoTaskListByUserIdInfo(taskCommonQuery);
         List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
         PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
         if (busProcessNames != null) {