From d4685e5f9594916ae20abee354ec7185a06a1125 Mon Sep 17 00:00:00 2001
From: songgaoshuai <1742057357@qq.com>
Date: 星期四, 07 三月 2024 15:42:32 +0800
Subject: [PATCH] add 添加撤销，终止，驳回，作废等状态校验
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/BusinessStatusEnum.java | 59 +++++++++++++++++++++++++++++
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java | 11 +----
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java | 5 +-
3 files changed, 64 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/BusinessStatusEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/BusinessStatusEnum.java
index 43204f5..6eb6ffe 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/BusinessStatusEnum.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/BusinessStatusEnum.java
@@ -89,5 +89,64 @@
throw new ServiceException("娴佺▼鐘舵�佷负绌猴紒");
}
}
+
+ /**
+ * 鎾ら攢娴佺▼鏍￠獙
+ *
+ * @param status 鐘舵��
+ */
+ public static void checkCancelStatus(String status) {
+ if (CANCEL.getStatus().equals(status)) {
+ throw new ServiceException("璇ュ崟鎹凡鎾ら攢锛�");
+ } else if (FINISH.getStatus().equals(status)) {
+ throw new ServiceException("璇ュ崟鎹凡瀹屾垚鐢宠锛�");
+ } else if (INVALID.getStatus().equals(status)) {
+ throw new ServiceException("璇ュ崟鎹凡浣滃簾锛�");
+ } else if (TERMINATION.getStatus().equals(status)) {
+ throw new ServiceException("璇ュ崟鎹凡缁堟锛�");
+ } else if (BACK.getStatus().equals(status)) {
+ throw new ServiceException("璇ュ崟鎹凡閫�鍥烇紒");
+ } else if (StringUtils.isBlank(status)) {
+ throw new ServiceException("娴佺▼鐘舵�佷负绌猴紒");
+ }
+ }
+
+ /**
+ * 椹冲洖娴佺▼鏍￠獙
+ *
+ * @param status 鐘舵��
+ */
+ public static void checkBackStatus(String status) {
+ if (BACK.getStatus().equals(status)) {
+ throw new ServiceException("璇ュ崟鎹凡閫�鍥烇紒");
+ } else if (FINISH.getStatus().equals(status)) {
+ throw new ServiceException("璇ュ崟鎹凡瀹屾垚鐢宠锛�");
+ } else if (INVALID.getStatus().equals(status)) {
+ throw new ServiceException("璇ュ崟鎹凡浣滃簾锛�");
+ } else if (TERMINATION.getStatus().equals(status)) {
+ throw new ServiceException("璇ュ崟鎹凡缁堟锛�");
+ } else if (CANCEL.getStatus().equals(status)) {
+ throw new ServiceException("璇ュ崟鎹凡鎾ら攢锛�");
+ } else if (StringUtils.isBlank(status)) {
+ throw new ServiceException("娴佺▼鐘舵�佷负绌猴紒");
+ }
+ }
+
+ /**
+ * 浣滃簾,缁堟娴佺▼鏍￠獙
+ *
+ * @param status 鐘舵��
+ */
+ public static void checkInvalidStatus(String status) {
+ if (FINISH.getStatus().equals(status)) {
+ throw new ServiceException("璇ュ崟鎹凡瀹屾垚鐢宠锛�");
+ } else if (INVALID.getStatus().equals(status)) {
+ throw new ServiceException("璇ュ崟鎹凡浣滃簾锛�");
+ } else if (TERMINATION.getStatus().equals(status)) {
+ throw new ServiceException("璇ュ崟鎹凡缁堟锛�");
+ } else if (StringUtils.isBlank(status)) {
+ throw new ServiceException("娴佺▼鐘舵�佷负绌猴紒");
+ }
+ }
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
index daf40ec..730aacd 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
@@ -60,7 +60,6 @@
import java.util.*;
import java.util.stream.Collectors;
-
/**
* 娴佺▼瀹炰緥 鏈嶅姟灞傚疄鐜�
*
@@ -464,10 +463,8 @@
for (Task task : StreamUtils.filter(list, e -> StringUtils.isBlank(e.getParentTaskId()))) {
taskService.addComment(task.getId(), task.getProcessInstanceId(), TaskStatusEnum.INVALID.getStatus(), deleteReason);
}
- HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery(processInvalidBo.getProcessInstanceId()).singleResult();
- if (ObjectUtil.isNotEmpty(historicProcessInstance) && BusinessStatusEnum.FINISH.getStatus().equals(historicProcessInstance.getBusinessStatus())) {
- throw new ServiceException("璇ュ崟鎹凡瀹屾垚鐢宠锛�");
- }
+ HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery(processInvalidBo.getProcessInstanceId()).singleResult();
+ BusinessStatusEnum.checkInvalidStatus(historicProcessInstance.getBusinessStatus());
runtimeService.updateBusinessStatus(processInvalidBo.getProcessInstanceId(), BusinessStatusEnum.INVALID.getStatus());
runtimeService.deleteProcessInstance(processInvalidBo.getProcessInstanceId(), deleteReason);
FlowProcessEventHandler processHandler = flowEventStrategy.getProcessHandler(historicProcessInstance.getProcessDefinitionKey());
@@ -577,9 +574,7 @@
if (processInstance.isSuspended()) {
throw new ServiceException(FlowConstant.MESSAGE_SUSPENDED);
}
- if (BusinessStatusEnum.CANCEL.getStatus().equals(processInstance.getBusinessStatus())) {
- throw new ServiceException("璇ュ崟鎹凡鎾ら攢锛�");
- }
+ BusinessStatusEnum.checkCancelStatus(processInstance.getBusinessStatus());
List<Task> taskList = QueryUtils.taskQuery(processInstanceId).list();
for (Task task : taskList) {
taskService.setAssignee(task.getId(), String.valueOf(LoginHelper.getUserId()));
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
index 968ca91..700dab5 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
@@ -474,9 +474,7 @@
}
HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery()
.processInstanceBusinessKey(task.getProcessInstanceId()).singleResult();
- if (ObjectUtil.isNotEmpty(historicProcessInstance) && BusinessStatusEnum.TERMINATION.getStatus().equals(historicProcessInstance.getBusinessStatus())) {
- throw new ServiceException("璇ュ崟鎹凡缁堟锛�");
- }
+ BusinessStatusEnum.checkInvalidStatus(historicProcessInstance.getBusinessStatus());
try {
if (StringUtils.isBlank(terminationBo.getComment())) {
terminationBo.setComment(LoginHelper.getLoginUser().getNickname() + "缁堟浜嗙敵璇�");
@@ -654,6 +652,7 @@
if (BusinessStatusEnum.BACK.getStatus().equals(processInstance.getBusinessStatus())) {
throw new ServiceException("璇ュ崟鎹凡閫�鍥烇紒");
}
+ BusinessStatusEnum.checkBackStatus(processInstance.getBusinessStatus());
//鍒ゆ柇鏄惁鏈夊涓换鍔�
List<Task> taskList = QueryUtils.taskQuery(processInstanceId).list();
//鐢宠浜鸿妭鐐�
--
Gitblit v1.9.3