From ebd2f4397a92c6a5096de1b86d59154363344720 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 五月 2025 08:48:15 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 7c84e2a..af1c34c 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
@@ -119,7 +119,7 @@
* 璧峰宸烽亾鍝堝笇
*/
@ApiModelProperty(value= "璧峰宸烽亾鍝堝笇")
- private Long oriLaneHash;
+ private String oriLaneHash;
/**
* 鐩爣绔�
@@ -143,7 +143,7 @@
* 鐩爣宸烽亾鍝堝笇
*/
@ApiModelProperty(value= "鐩爣宸烽亾鍝堝笇")
- private Long destLaneHash;
+ private String destLaneHash;
/**
* 绌烘澘
@@ -400,8 +400,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 +418,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