From 82dadf2e9fbd30756ccd419a17cda9d41c6a032b Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 24 九月 2024 14:50:58 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java index 417eab2..5a34b01 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java @@ -109,13 +109,13 @@ * 绉熸埛 */ @ApiModelProperty(value= "绉熸埛") - private Integer tenantId; + private Long tenantId; /** * 娣诲姞浜哄憳 */ @ApiModelProperty(value= "娣诲姞浜哄憳") - private Integer createBy; + private Long createBy; /** * 娣诲姞鏃堕棿 @@ -127,7 +127,7 @@ * 淇敼浜哄憳 */ @ApiModelProperty(value= "淇敼浜哄憳") - private Integer updateBy; + private Long updateBy; /** * 淇敼鏃堕棿 @@ -143,7 +143,7 @@ public Segment() {} - public Segment(String uuid,Long travelId,Long taskId,Long agvId,Integer serial,Long startNode,Long endNode,String state,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) { + public Segment(String uuid,Long travelId,Long taskId,Long agvId,Integer serial,Long startNode,Long endNode,String state,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { this.uuid = uuid; this.travelId = travelId; this.taskId = taskId; @@ -229,17 +229,18 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } - } -- Gitblit v1.9.1