From f5c900c58513bad824381e69750ac7667ef35de0 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 26 二月 2026 22:29:46 +0800
Subject: [PATCH] feat: 修改增另任务单查询，使用单号查询
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 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 b6e913e..1fb1f46 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
@@ -32,18 +32,7 @@
@Excel(name = "浠诲姟鐘舵��", readConverterExp = "PENDING=寰呭紑濮�,IN_PROGRESS=浠诲姟涓�,COMPLETED=宸插畬鎴�,CANCELLED=宸插彇娑�")
private String taskStatus;
- /** 鏄惁鎬婚儴鎺ㄩ�� */
- @Excel(name = "鏄惁鎬婚儴鎺ㄩ��", readConverterExp = "0=鍚�,1=鏄�")
- private String isHeadPush;
-
- public void setIsHeadPush(String isHeadPush) {
- this.isHeadPush = isHeadPush;
- }
-
- public String getIsHeadPush() {
- return isHeadPush;
- }
/** 浠诲姟鎻忚堪 */
@Excel(name = "浠诲姟鎻忚堪")
private String taskDescription;
@@ -153,6 +142,27 @@
private String showTaskCode;
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;
}
/**
* 鑾峰彇鏄剧ず浠诲姟缂栧彿锛屼紭鍏堣繑鍥炴�ユ晳杞繍鐨勮皟搴﹀崟缂栧彿锛屽叾娆℃槸鏈嶅姟鍗曠紪鍙凤紝鏈�鍚庢槸浠诲姟缂栧彿
@@ -444,8 +454,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