From 13ea8b334572c2423abb8d156fd8428f8d074172 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 08:24:58 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
index 40807f5..86c3a04 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
@@ -96,6 +96,11 @@
*/
@ApiModelProperty(value= "寮傚父鏃堕棿")
private Date errTime;
+ /**
+ * 鑳岀瘬
+ */
+ @ApiModelProperty(value= "鑳岀瘬")
+ private Integer back;
/**
* 璧峰绔�
@@ -400,8 +405,12 @@
if (null != this.oriLoc) {
oriDesc = "LOC" + " - " + this.getOriLoc$();
}
- if (!Cools.isEmpty(oriDesc) && null != this.oriCode) {
- oriDesc = oriDesc + " (" + this.getOriCode$() + ")";
+ if (!Cools.isEmpty(oriDesc)) {
+ if (null != this.oriCode) {
+ oriDesc = oriDesc + " (" + this.getOriCode$() + ")";
+ }
+ } else {
+ oriDesc = "CODE" + " - " + this.getOriCode$();
}
return oriDesc;
}
@@ -414,8 +423,12 @@
if (null != this.destLoc) {
destDesc = "LOC" + " - " + this.getDestLoc$();
}
- if (!Cools.isEmpty(destDesc) && null != this.destCode) {
- destDesc = destDesc + " (" + this.getDestCode$() + ")";
+ if (!Cools.isEmpty(destDesc)) {
+ if (null != this.destCode) {
+ destDesc = destDesc + " (" + this.getDestCode$() + ")";
+ }
+ } else {
+ destDesc = "CODE" + " - " + this.getDestCode$();
}
return destDesc;
}
--
Gitblit v1.9.1