From 40a8157440e3b906da8f52e07d939d78c3f4c313 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 12 四月 2026 16:14:06 +0800
Subject: [PATCH] feat: 任务增加统计、同步增加通知
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 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 da2a3c4..a231557 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
@@ -143,6 +143,27 @@
public void setShowTaskCode(String showTaskCode) {
showTaskCode=this.showTaskCode;
}
+
+ // 鐢ㄤ簬SQL鏄犲皠鐨勫瓧娈碉紙澶氱爜鏌ヨ浼樺寲锛�
+ //杩欎簺瀛楁鎺ユ敹SQL鏌ヨ涓绠楀嚭鐨刣ispatchCode鍜宻erviceCode鍊�
+ private String dispatchCode;
+ private String serviceCode;
+
+ public String getDispatchCode() {
+ return dispatchCode;
+ }
+
+ public void setDispatchCode(String dispatchCode) {
+ this.dispatchCode = dispatchCode;
+ }
+
+ public String getServiceCode() {
+ return serviceCode;
+ }
+
+ public void setServiceCode(String serviceCode) {
+ this.serviceCode = serviceCode;
+ }
/**
* 鑾峰彇鏄剧ず浠诲姟缂栧彿锛屼紭鍏堣繑鍥炴�ユ晳杞繍鐨勮皟搴﹀崟缂栧彿锛屽叾娆℃槸鏈嶅姟鍗曠紪鍙凤紝鏈�鍚庢槸浠诲姟缂栧彿
*/
@@ -420,6 +441,9 @@
// 鐘舵�佹祦杞鍒�
switch (currentStatus) {
+ case NOT_CONFIRMED:
+ case NOT_DEPARTED:
+ case PARTIALLY_CONFIRMED:
case PENDING:
// 寰呭鐞� -> 鍑哄彂涓�佸凡鍙栨秷
return newStatus == TaskStatus.DEPARTING || newStatus == TaskStatus.CANCELLED;
@@ -433,8 +457,12 @@
// 杩旂▼涓� -> 宸插畬鎴�
return newStatus == TaskStatus.COMPLETED;
case IN_PROGRESS:
- // 鍏煎鏃ф暟鎹細浠诲姟涓� -> 宸插畬鎴愩�佸凡鍙栨秷銆佸緟澶勭悊
- return newStatus == TaskStatus.COMPLETED || newStatus == TaskStatus.CANCELLED || newStatus == TaskStatus.PENDING;
+ // 鍏煎鏃ф暟鎹細浠诲姟涓� -> 宸插畬鎴愩�佸凡鍙栨秷銆佸緟澶勭悊銆佸凡鍒拌揪銆佽繑绋嬩腑
+ return newStatus == TaskStatus.COMPLETED
+ || newStatus == TaskStatus.CANCELLED
+ || newStatus == TaskStatus.PENDING
+ || newStatus == TaskStatus.ARRIVED
+ || newStatus == TaskStatus.RETURNING;
case COMPLETED:
case CANCELLED:
// 宸插畬鎴愩�佸凡鍙栨秷 -> 涓嶅厑璁镐换浣曠姸鎬佸彉鏇�
--
Gitblit v1.9.1