From 0f8bc78441b7b2882a7d08930cdfa46023f42127 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 23 Nov 2021 17:02:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E5=8A=9E=E7=9A=84?=
 =?UTF-8?q?=E6=96=B0=E6=8E=A5=E5=8F=A3=20=E7=9B=AE=E5=89=8D=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E6=A0=87=E5=87=86=E5=8F=B7=20=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=20=E5=92=8C=20=E6=A0=87=E5=87=86=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=20=E7=9A=84=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/FeignClient/workFlowFeignClient.java   |  3 +++
 .../workFlowFeignClientImpl.java              |  5 +++++
 .../controller/WorkFlowController.java        | 21 +++++++++++++++++++
 3 files changed, 29 insertions(+)

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<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery);
 
+    @RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST)
+    List<BusProcessName> todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery);
+
     @RequestMapping(value = "/bat-wkflow/completeTask",method = RequestMethod.POST)
     Wrapper<String> 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<BusProcessName> todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery){
+        List<BusProcessName> 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<BusProcessName> todoTaskListNew(@RequestBody TaskCommonQuery taskCommonQuery){
+        List<BusProcessName> busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery);
+        List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
+        PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
+        if(busProcessNames!=null){
+            pageInfo.setList(list1);
+            pageInfo.setPageNo(taskCommonQuery.getCurrent());
+            pageInfo.setCount(Long.valueOf(busProcessNames.size()));
+            pageInfo.setPageSize(taskCommonQuery.getSize());
+        }else{
+            List<BusProcessName> 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<String> completeTaskByUserId( BusMes busMes){