From aef8335b6ebcba2b499e0c86edf3e4ee798e4af9 Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Sat, 29 Jan 2022 12:09:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=E5=8D=87=E7=BA=A7=20flowable=20?=
=?UTF-8?q?=E7=89=88=E6=9C=AC=202.=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 2 +-
.../service/impl/FlowDefinitionServiceImpl.java | 2 +-
.../service/impl/FlowTaskServiceImpl.java | 16 ++++++++--------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 936857f..1d1091d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
4.1.2
1.7
0.9.1
- 6.5.0
+ 6.7.2
1.9.6
diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java
index 154ec34..1a7680e 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java
@@ -80,7 +80,7 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
// .latestVersion()
.orderByProcessDefinitionKey().asc();
page.setTotal(processDefinitionQuery.count());
- List processDefinitionList = processDefinitionQuery.listPage(pageNum - 1, pageSize);
+ List processDefinitionList = processDefinitionQuery.listPage(pageSize * (pageNum - 1), pageSize);
List dataList = new ArrayList<>();
for (ProcessDefinition processDefinition : processDefinitionList) {
diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
index fd08d6e..9eb573e 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
@@ -86,7 +86,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
@Override
public AjaxResult complete(FlowTaskVo taskVo) {
Task task = taskService.createTaskQuery().taskId(taskVo.getTaskId()).singleResult();
- if (Objects.isNull(task)){
+ if (Objects.isNull(task)) {
return AjaxResult.error("任务不存在");
}
if (DelegationState.PENDING.equals(task.getDelegationState())) {
@@ -354,7 +354,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
@Override
public void deleteTask(FlowTaskVo flowTaskVo) {
// todo 待确认删除任务是物理删除任务 还是逻辑删除,让这个任务直接通过?
- taskService.deleteTask(flowTaskVo.getTaskId(),flowTaskVo.getComment());
+ taskService.deleteTask(flowTaskVo.getTaskId(), flowTaskVo.getComment());
}
/**
@@ -399,7 +399,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
@Override
@Transactional(rollbackFor = Exception.class)
public void assignTask(FlowTaskVo flowTaskVo) {
- taskService.setAssignee(flowTaskVo.getTaskId(),flowTaskVo.getComment());
+ taskService.setAssignee(flowTaskVo.getTaskId(), flowTaskVo.getComment());
}
/**
@@ -417,7 +417,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
.startedBy(userId.toString())
.orderByProcessInstanceStartTime()
.desc();
- List historicProcessInstances = historicProcessInstanceQuery.listPage(pageNum - 1, pageSize);
+ List historicProcessInstances = historicProcessInstanceQuery.listPage(pageSize * (pageNum - 1), pageSize);
page.setTotal(historicProcessInstanceQuery.count());
List flowList = new ArrayList<>();
for (HistoricProcessInstance hisIns : historicProcessInstances) {
@@ -570,7 +570,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
// .taskAssignee(userId.toString())
.orderByTaskCreateTime().desc();
page.setTotal(taskQuery.count());
- List taskList = taskQuery.listPage(pageNum - 1, pageSize);
+ List taskList = taskQuery.listPage(pageSize * (pageNum - 1), pageSize);
List flowList = new ArrayList<>();
for (Task task : taskList) {
FlowTaskDto flowTask = new FlowTaskDto();
@@ -623,7 +623,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
.taskAssignee(userId.toString())
.orderByHistoricTaskInstanceEndTime()
.desc();
- List historicTaskInstanceList = taskInstanceQuery.listPage(pageNum - 1, pageSize);
+ List historicTaskInstanceList = taskInstanceQuery.listPage(pageSize * (pageNum - 1), pageSize);
List hisTaskList = Lists.newArrayList();
for (HistoricTaskInstance histTask : historicTaskInstanceList) {
FlowTaskDto flowTask = new FlowTaskDto();
@@ -657,7 +657,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
flowTask.setStartDeptName(startUser.getDept().getDeptName());
hisTaskList.add(flowTask);
}
- page.setTotal(hisTaskList.size());
+ page.setTotal(taskInstanceQuery.count());
page.setRecords(hisTaskList);
// Map result = new HashMap<>();
// result.put("result",page);
@@ -868,7 +868,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
List nextUserTask = FindNextNodeUtil.getNextUserTasks(repositoryService, task, new HashMap<>());
if (CollectionUtils.isNotEmpty(nextUserTask)) {
for (UserTask userTask : nextUserTask) {
- MultiInstanceLoopCharacteristics multiInstance = userTask.getLoopCharacteristics();
+ MultiInstanceLoopCharacteristics multiInstance = userTask.getLoopCharacteristics();
// 会签节点
if (Objects.nonNull(multiInstance)) {
List list = sysUserService.selectUserList(new SysUser());