From b46065a201c09ce69f111806f2bda4a5f476bc4e Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 18 十月 2025 17:20:22 +0800
Subject: [PATCH] fix:用户同步，机构同步
---
ruoyi-system/src/main/java/com/ruoyi/system/utils/TaskStatusValidator.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/utils/TaskStatusValidator.java b/ruoyi-system/src/main/java/com/ruoyi/system/utils/TaskStatusValidator.java
index b62b5d6..741eec1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/utils/TaskStatusValidator.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/utils/TaskStatusValidator.java
@@ -18,13 +18,29 @@
private static final Map<TaskStatus, Set<TaskStatus>> ALLOWED_TRANSITIONS = new HashMap<>();
static {
- // PENDING -> IN_PROGRESS, CANCELLED
+ // PENDING -> DEPARTING, CANCELLED
Set<TaskStatus> pendingTransitions = new HashSet<>();
- pendingTransitions.add(TaskStatus.IN_PROGRESS);
+ pendingTransitions.add(TaskStatus.DEPARTING);
pendingTransitions.add(TaskStatus.CANCELLED);
ALLOWED_TRANSITIONS.put(TaskStatus.PENDING, pendingTransitions);
- // IN_PROGRESS -> COMPLETED, CANCELLED, PENDING
+ // DEPARTING -> ARRIVED, CANCELLED
+ Set<TaskStatus> departingTransitions = new HashSet<>();
+ departingTransitions.add(TaskStatus.ARRIVED);
+ departingTransitions.add(TaskStatus.CANCELLED);
+ ALLOWED_TRANSITIONS.put(TaskStatus.DEPARTING, departingTransitions);
+
+ // ARRIVED -> RETURNING
+ Set<TaskStatus> arrivedTransitions = new HashSet<>();
+ arrivedTransitions.add(TaskStatus.RETURNING);
+ ALLOWED_TRANSITIONS.put(TaskStatus.ARRIVED, arrivedTransitions);
+
+ // RETURNING -> COMPLETED
+ Set<TaskStatus> returningTransitions = new HashSet<>();
+ returningTransitions.add(TaskStatus.COMPLETED);
+ ALLOWED_TRANSITIONS.put(TaskStatus.RETURNING, returningTransitions);
+
+ // IN_PROGRESS -> COMPLETED, CANCELLED, PENDING (鍏煎鏃ф暟鎹�)
Set<TaskStatus> inProgressTransitions = new HashSet<>();
inProgressTransitions.add(TaskStatus.COMPLETED);
inProgressTransitions.add(TaskStatus.CANCELLED);
--
Gitblit v1.9.1