From 052ee1f9c0b9e2bc8bbd4cf135ae45fed7422023 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 28 十月 2024 10:36:28 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 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 a765540..40807f5 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
@@ -116,6 +116,12 @@
private Long oriCode;
/**
+ * 璧峰宸烽亾鍝堝笇
+ */
+ @ApiModelProperty(value= "璧峰宸烽亾鍝堝笇")
+ private String oriLaneHash;
+
+ /**
* 鐩爣绔�
*/
@ApiModelProperty(value= "鐩爣绔�")
@@ -132,6 +138,12 @@
*/
@ApiModelProperty(value= "鐩爣鐮�")
private Long destCode;
+
+ /**
+ * 鐩爣宸烽亾鍝堝笇
+ */
+ @ApiModelProperty(value= "鐩爣宸烽亾鍝堝笇")
+ private String destLaneHash;
/**
* 绌烘澘
@@ -368,20 +380,6 @@
return null;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "鍐荤粨";
- default:
- return String.valueOf(this.status);
- }
- }
-
-
-
public Boolean getStatusBool(){
if (null == this.status){ return null; }
switch (this.status){
@@ -394,5 +392,32 @@
}
}
+ public String getOriDesc() {
+ String oriDesc = "";
+ if (null != this.oriSta) {
+ oriDesc = "STA" + " - " + this.getOriSta$();
+ }
+ if (null != this.oriLoc) {
+ oriDesc = "LOC" + " - " + this.getOriLoc$();
+ }
+ if (!Cools.isEmpty(oriDesc) && null != this.oriCode) {
+ oriDesc = oriDesc + " (" + this.getOriCode$() + ")";
+ }
+ return oriDesc;
+ }
+
+ public String getDestDesc() {
+ String destDesc = "";
+ if (null != this.destSta) {
+ destDesc = "STA" + " - " + this.getDestSta$();
+ }
+ if (null != this.destLoc) {
+ destDesc = "LOC" + " - " + this.getDestLoc$();
+ }
+ if (!Cools.isEmpty(destDesc) && null != this.destCode) {
+ destDesc = destDesc + " (" + this.getDestCode$() + ")";
+ }
+ return destDesc;
+ }
}
--
Gitblit v1.9.1