From b77393151d1f97b5ed175dae0cff4d04c80044a4 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 23 Nov 2021 18:35:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E4=BB=A3=E5=8A=9E=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/TodoTaskController.java              | 14 ++++++++++++
 .../datas/mapper/BusProcessNameMapper.java    |  3 +++
 .../datas/service/IBusProcessNameService.java |  4 ++++
 .../impl/BusProcessNameServiceImpl.java       |  6 +++++
 .../mapper/datas/BusProcessNameMapper.xml     | 22 +++++++++++++++++++
 5 files changed, 49 insertions(+)

diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
index 9ab88979..91f3d3a0 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
@@ -190,6 +190,20 @@ public class TodoTaskController extends BaseAction {
         return todoList;
     }
 
+
+    @ApiOperation(value = "我的待办任务列表速度优化项")
+    @ApiImplicitParams({@ApiImplicitParam(name = "name", value = "名称"),
+            @ApiImplicitParam(name = "current", value = "当前页"),
+            @ApiImplicitParam(name = "size", value = "每页条数"),
+            @ApiImplicitParam(name = "userId", value = "用户Id")})
+    @PostMapping("/todoTaskListNew")
+    public List<BusProcessName> todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery) {
+        // 创建查询对象
+        List<BusProcessName> busProcessNames=new ArrayList<>();
+        busProcessNames=iBusProcessNameService.todoTask(taskCommonQuery);
+        return busProcessNames;
+    }
+
     @ApiOperation(value = "改派任务")
     @ApiImplicitParams({@ApiImplicitParam(name = "taskId", value = "任务id"),
             @ApiImplicitParam(name = "assignee", value = "改派人员")})
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNameMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNameMapper.java
index 9abffa86..eda674e8 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNameMapper.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNameMapper.java
@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.business_main.datas.mapper;
 
+import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,4 +20,6 @@ public interface BusProcessNameMapper extends BaseMapper<BusProcessName> {
     //查询符合要求的 name 信息
     List<BusProcessName> findBusProcessNameForEnd(String taskId);
 
+    List<BusProcessName> todoTask(@Param("task") TaskCommonQuery taskCommonQuery);
+
 }
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java
index ef1a600f..2f931d6c 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java
@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.business_main.datas.service;
 
+import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,4 +18,7 @@ import java.util.List;
 public interface IBusProcessNameService extends IService<BusProcessName> {
 
     List<BusProcessName> findBusProcessNameForEnd(String prcNum);
+
+    //新查询代办接口 初步测试中
+    List<BusProcessName> todoTask(TaskCommonQuery taskCommonQuery);
 }
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java
index 6b082b8a..cc8ee279 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.business_main.datas.service.impl;
 
+import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNameMapper;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
@@ -28,4 +29,9 @@ public class BusProcessNameServiceImpl extends ServiceImpl<BusProcessNameMapper,
         return busProcessNameMapper.findBusProcessNameForEnd(taskId);
     }
 
+    @Override
+    public List<BusProcessName> todoTask(TaskCommonQuery taskCommonQuery) {
+        return busProcessNameMapper.todoTask(taskCommonQuery);
+    }
+
 }
diff --git a/src/main/resources/mapper/datas/BusProcessNameMapper.xml b/src/main/resources/mapper/datas/BusProcessNameMapper.xml
index 492b07f8..a81c520d 100644
--- a/src/main/resources/mapper/datas/BusProcessNameMapper.xml
+++ b/src/main/resources/mapper/datas/BusProcessNameMapper.xml
@@ -29,4 +29,26 @@
             AND BUS_PROCESS_NEW.TASK_ID = #{taskId}
         </if>
     </select>
+
+    <select id="todoTask" resultType="com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName">
+        SELECT DATE_FORMAT(bus_process_name.CREAT_TIME,'%Y-%m-%d  %T') as creatTime,bus_process_name.CREAT_USER as creatUser
+        ,bus_process_name.CREATE_USER_NAME as createUserName,DATE_FORMAT(bus_process_name.END_TIME,'%Y-%m-%d  %T') as endTime
+        ,bus_process_name.ID as id ,bus_process_name.MES as mes,DATE_FORMAT(bus_process_name.OVER_TIME,'%Y-%m-%d  %T') as overTime
+        ,bus_process_name.PRC_ID as prcId,bus_process_name.PRC_MES as prcMes, bus_process_new.PRC_NAME as prcName
+        ,bus_process_name.PRC_NUM as prcNum,bus_process_name.PRC_TYPE as prcType,act_ru_task.ASSIGNEE_ as taskAssignee
+        ,bus_process_new.TASK_ID as taskIds,bus_process_new.TASK_INFO as taskInfo
+        FROM act_ru_task
+        LEFT JOIN bus_process_name on bus_process_name.PRC_ID = act_ru_task.PROC_INST_ID_
+        LEFT JOIN bus_process_new on bus_process_new.TASK_ID =act_ru_task.ID_
+        WHERE act_ru_task.ASSIGNEE_ = #{task.userId}
+        <if test="null != task.prcName  and '' !=task.prcName ">
+            and bus_process_new.PRC_NAME like concat(concat('%',#{task.prcName}),'%')
+        </if>
+        <if test="null != task.prcNum  and '' !=task.prcNum ">
+            and bus_process_name.PRC_NUM like concat(concat('%',#{task.prcNum}),'%')
+        </if>
+        <if test="null != task.prcType  and '' !=task.prcType ">
+            and bus_process_name.PRC_TYPE like concat(concat('%',#{task.prcNum}),'%')
+        </if>
+    </select>
 </mapper>