From f08739f46afe856f60ebb1d21ab23d72947629ed Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 21 十二月 2025 00:03:12 +0800
Subject: [PATCH] feat:优化任务搜索查询 app
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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 5e549d6..da2a3c4 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,6 +32,7 @@
@Excel(name = "浠诲姟鐘舵��", readConverterExp = "PENDING=寰呭紑濮�,IN_PROGRESS=浠诲姟涓�,COMPLETED=宸插畬鎴�,CANCELLED=宸插彇娑�")
private String taskStatus;
+
/** 浠诲姟鎻忚堪 */
@Excel(name = "浠诲姟鎻忚堪")
private String taskDescription;
@@ -88,6 +89,8 @@
@Excel(name = "鍒涘缓浜篒D")
private Long creatorId;
+
+
/** 鎵ц浜篒D */
@Excel(name = "鎵ц浜篒D")
private Long assigneeId;
@@ -136,6 +139,28 @@
/** 绂忕杞︽墿灞曚俊鎭� */
private SysTaskWelfare welfareInfo;
+ private String showTaskCode;
+ public void setShowTaskCode(String showTaskCode) {
+ showTaskCode=this.showTaskCode;
+ }
+ /**
+ * 鑾峰彇鏄剧ず浠诲姟缂栧彿锛屼紭鍏堣繑鍥炴�ユ晳杞繍鐨勮皟搴﹀崟缂栧彿锛屽叾娆℃槸鏈嶅姟鍗曠紪鍙凤紝鏈�鍚庢槸浠诲姟缂栧彿
+ */
+ public String getShowTaskCode(){
+
+ if(this.emergencyInfo!=null){
+ String dispatchOrdCode=this.emergencyInfo.getDispatchCode();
+ if(dispatchOrdCode!=null){
+ return dispatchOrdCode;
+ }
+ String serviceOrdCode=this.emergencyInfo.getServiceCode();
+ if(serviceOrdCode!=null){
+ return serviceOrdCode;
+ }
+ }
+ return this.taskCode;
+ }
+
public void setTaskId(Long taskId) {
this.taskId = taskId;
}
--
Gitblit v1.9.1