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/domain/SysTask.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java
index 99c8bad..0cb20ea 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java
@@ -120,6 +120,12 @@
/** 鎿嶄綔鏃ュ織鍒楄〃 */
private List<SysTaskLog> operationLogs;
+ /** 鎬ユ晳杞繍鎵╁睍淇℃伅 */
+ private SysTaskEmergency emergencyInfo;
+
+ /** 绂忕杞︽墿灞曚俊鎭� */
+ private SysTaskWelfare welfareInfo;
+
public void setTaskId(Long taskId) {
this.taskId = taskId;
}
@@ -328,6 +334,22 @@
return operationLogs;
}
+ public void setEmergencyInfo(SysTaskEmergency emergencyInfo) {
+ this.emergencyInfo = emergencyInfo;
+ }
+
+ public SysTaskEmergency getEmergencyInfo() {
+ return emergencyInfo;
+ }
+
+ public void setWelfareInfo(SysTaskWelfare welfareInfo) {
+ this.welfareInfo = welfareInfo;
+ }
+
+ public SysTaskWelfare getWelfareInfo() {
+ return welfareInfo;
+ }
+
/**
* 鍒ゆ柇鏄惁鍙互鍙樻洿鐘舵��
*/
@@ -340,11 +362,23 @@
// 鐘舵�佹祦杞鍒�
switch (currentStatus) {
case PENDING:
- return newStatus == TaskStatus.IN_PROGRESS || newStatus == TaskStatus.CANCELLED;
+ // 寰呭鐞� -> 鍑哄彂涓�佸凡鍙栨秷
+ return newStatus == TaskStatus.DEPARTING || newStatus == TaskStatus.CANCELLED;
+ case DEPARTING:
+ // 鍑哄彂涓� -> 宸插埌杈俱�佸凡鍙栨秷
+ return newStatus == TaskStatus.ARRIVED || newStatus == TaskStatus.CANCELLED;
+ case ARRIVED:
+ // 宸插埌杈� -> 杩旂▼涓�
+ return newStatus == TaskStatus.RETURNING;
+ case RETURNING:
+ // 杩旂▼涓� -> 宸插畬鎴�
+ return newStatus == TaskStatus.COMPLETED;
case IN_PROGRESS:
+ // 鍏煎鏃ф暟鎹細浠诲姟涓� -> 宸插畬鎴愩�佸凡鍙栨秷銆佸緟澶勭悊
return newStatus == TaskStatus.COMPLETED || newStatus == TaskStatus.CANCELLED || newStatus == TaskStatus.PENDING;
case COMPLETED:
case CANCELLED:
+ // 宸插畬鎴愩�佸凡鍙栨秷 -> 涓嶅厑璁镐换浣曠姸鎬佸彉鏇�
return false;
default:
return false;
@@ -426,4 +460,4 @@
", deptName='" + deptName + '\'' +
'}';
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1