From 656d6f8029f8bf9b2daa9dcc89101a879a70b860 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期三, 03 十二月 2025 23:10:05 +0800
Subject: [PATCH] feat:优先添加执行人

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java |   79 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 77 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..5e549d6 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
@@ -108,8 +108,15 @@
     @Excel(name = "閮ㄩ棬鍚嶇О")
     private String deptName;
 
+    /** 杞︾墝鍙�(鍒楄〃鏄剧ず绗竴杈嗚溅) */
+    @Excel(name = "杞︾墝鍙�")
+    private String vehicleNo;
+
     /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
     private String delFlag;
+
+    /** 鏃х郴缁熷悓姝ユ爣璁帮細0-鏈悓姝ワ紝1-宸插悓姝� */
+    private Integer legacySynced;
 
     /** 鍏宠仈杞﹁締鍒楄〃 */
     private List<SysTaskVehicle> assignedVehicles;
@@ -119,6 +126,15 @@
 
     /** 鎿嶄綔鏃ュ織鍒楄〃 */
     private List<SysTaskLog> operationLogs;
+
+    /** 鎵ц浜哄憳鍒楄〃 */
+    private List<SysTaskAssignee> assignees;
+
+    /** 鎬ユ晳杞繍鎵╁睍淇℃伅 */
+    private SysTaskEmergency emergencyInfo;
+
+    /** 绂忕杞︽墿灞曚俊鎭� */
+    private SysTaskWelfare welfareInfo;
 
     public void setTaskId(Long taskId) {
         this.taskId = taskId;
@@ -296,12 +312,28 @@
         return deptName;
     }
 
+    public void setVehicleNo(String vehicleNo) {
+        this.vehicleNo = vehicleNo;
+    }
+
+    public String getVehicleNo() {
+        return vehicleNo;
+    }
+
     public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
 
     public String getDelFlag() {
         return delFlag;
+    }
+
+    public void setLegacySynced(Integer legacySynced) {
+        this.legacySynced = legacySynced;
+    }
+
+    public Integer getLegacySynced() {
+        return legacySynced;
     }
 
     public void setAssignedVehicles(List<SysTaskVehicle> assignedVehicles) {
@@ -328,6 +360,30 @@
         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;
+    }
+
+    public void setAssignees(List<SysTaskAssignee> assignees) {
+        this.assignees = assignees;
+    }
+
+    public List<SysTaskAssignee> getAssignees() {
+        return assignees;
+    }
+
     /**
      * 鍒ゆ柇鏄惁鍙互鍙樻洿鐘舵��
      */
@@ -340,15 +396,34 @@
         // 鐘舵�佹祦杞鍒�
         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;
         }
+    }
+
+    public void setPlanedStartTime(Date plannedStartTime) {
+        this.plannedStartTime = plannedStartTime;
+    }
+    public Date getPlanedStartTime() {
+        return plannedStartTime;
     }
 
     /**
@@ -426,4 +501,4 @@
                 ", deptName='" + deptName + '\'' +
                 '}';
     }
-}
+}
\ No newline at end of file

--
Gitblit v1.9.1