From 6ffe04363f986f877656eff9da15bd2bac3334d2 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Tue, 25 Apr 2023 09:18:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=E4=BB=A3=E5=8A=9E?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/TaskTodoService.java | 18 ----- .../task/TodoTaskController.java | 10 +-- .../business_main/entity/TaskEntity.java | 73 ------------------- .../business_main/mapper/TaskMapper.java | 18 ----- 4 files changed, 4 insertions(+), 115 deletions(-) delete mode 100644 report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/TaskEntity.java delete mode 100644 report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/TaskMapper.java diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/TaskTodoService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/TaskTodoService.java index 03ae725..dbbdb24 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/TaskTodoService.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/TaskTodoService.java @@ -2,12 +2,9 @@ package com.adc.da.wkflow.business_activiti.service; import cn.hutool.core.util.StrUtil; import com.adc.da.wkflow.business_activiti.dto.TaskCommonQuery; -import com.adc.da.wkflow.business_main.mapper.TaskMapper; import com.adc.da.wkflow.util.date.DateTools; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.activiti.engine.TaskService; import org.activiti.engine.task.NativeTaskQuery; -import org.activiti.engine.task.Task; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; -import java.util.List; /** * 待办任务注入类，动态修改 Task的assignee等 @@ -31,8 +27,6 @@ public class TaskTodoService { @Autowired private TaskService taskService; - @Autowired - private TaskMapper taskMapper; /** * 查询待办任务 拼接sql 包含待办任务和委托任务 @@ -83,16 +77,4 @@ public class TaskTodoService { } - - public Page selectTask(TaskCommonQuery taskCommonQuery){ - Page page = new Page<>(); - page.setCurrent(taskCommonQuery.getCurrent()); - page.setSize(taskCommonQuery.getSize()); - List tasks = taskMapper.todoTaskList(page, taskCommonQuery); - long count = taskMapper.todoTaskListCount( taskCommonQuery); - page.setRecords(tasks); - page.setSize(count); - return page; - } - } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index b09f4c2..cc44180 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -130,11 +130,9 @@ public class TodoTaskController { } // 创建查询对象 NativeTaskQuery nativeTaskQuery = taskTodoService.createSql(taskCommonQuery); -// com.baomidou.mybatisplus.extension.plugins.pagination.Page page1 = taskTodoService.selectTask(taskCommonQuery); -// List list = page1.getRecords(); - List list1 = nativeTaskQuery.list(); - List list = nativeTaskQuery.listPage(taskCommonQuery.getCurrent(),taskCommonQuery.getSize()); - List> listEnd = ActivitiTools.turnTasks(list); + List list = nativeTaskQuery.list(); + List listPage = this.startPage(list, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); + List> listEnd = ActivitiTools.turnTasks(listPage); for (Map map : listEnd) { ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(map.get("processDefinitionId") + "").singleResult(); map.put("processInstanceName", processDefinition.getName()); @@ -188,7 +186,7 @@ public class TodoTaskController { } } page.setList(todoList); - page.setCount((long) list1.size()); + page.setCount((long)list.size()); // page.setCount(page1.getSize()); return Result.success(page); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/TaskEntity.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/TaskEntity.java deleted file mode 100644 index e6501a0..0000000 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/TaskEntity.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.adc.da.wkflow.business_main.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.util.Date; - -@Data -@TableName("ACT_RU_TASK") -public class TaskEntity { - - @TableId(value = "ID_", type = IdType.INPUT) - private String id; - - @TableField("REV_") - private int rev; - - @TableField("EXECUTION_ID_") - private String executionId; - - @TableField("PROC_INST_ID_") - private String processInstanceId; - - @TableField("PROC_DEF_ID_") - private String processDefinitionId; - - @TableField("NAME_") - private String name; - - @TableField("PARENT_TASK_ID_") - private String parentTaskId; - - @TableField("DESCRIPTION_") - private String description; - - @TableField("TASK_DEF_KEY_") - private String taskDefinitionKey; - - @TableField("OWNER_") - private String owner; - - @TableField("ASSIGNEE_") - private String assignee; - - @TableField("DELEGATION_") - private String delegation; - - @TableField("PRIORITY_") - private int priority; - - @TableField("CREATE_TIME_") - private Date createTime; - - @TableField("DUE_DATE_") - private Date dueDate; - - @TableField("CATEGORY_") - private String category; - - @TableField("SUSPENSION_STATE_") - private int suspensionState; - - @TableField("TENANT_ID_") - private String tenantId; - - @TableField("FORM_KEY_") - private String formKey; - - -} diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/TaskMapper.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/TaskMapper.java deleted file mode 100644 index 67f4985..0000000 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/TaskMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.adc.da.wkflow.business_main.mapper; - -import com.adc.da.wkflow.business_activiti.dto.TaskCommonQuery; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.activiti.engine.task.Task; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TaskMapper extends BaseMapper { - - - List todoTaskList(Page page, @Param("pageVO") TaskCommonQuery taskCommonQuery); - - long todoTaskListCount(@Param("pageVO") TaskCommonQuery taskCommonQuery); - -}