From 9f90ab48ee848a56f45c80e5d050676d4f3a6c2f Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 24 九月 2024 09:55:29 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java | 59 +++++++++++++++++------------------------------------------ 1 files changed, 17 insertions(+), 42 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java index a234fa9..cee3d75 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java @@ -1,6 +1,7 @@ package com.zy.acs.manager.manager.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.zy.acs.framework.common.Cools; @@ -11,6 +12,7 @@ import java.io.Serializable; import java.util.Date; +import java.util.List; @Data @TableName("man_bus") @@ -34,8 +36,8 @@ /** * 浠诲姟缂栧彿 */ - @ApiModelProperty(value= "浠诲姟缂栧彿") - private String seqNum; + @ApiModelProperty(value= "鎬绘壒鍙�") + private String busNo; /** * 寮�濮嬫椂闂� @@ -109,41 +111,11 @@ @ApiModelProperty(value= "澶囨敞") private String memo; - public Bus() {} + @TableField(exist = false) + private int tasksNum = 0; - public Bus(String uuid,String seqNum,Date startTime,Date endTime,Long busSts,String phase,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { - this.uuid = uuid; - this.seqNum = seqNum; - this.startTime = startTime; - this.endTime = endTime; - this.busSts = busSts; - this.phase = phase; - this.status = status; - this.deleted = deleted; - this.tenantId = tenantId; - this.createBy = createBy; - this.createTime = createTime; - this.updateBy = updateBy; - this.updateTime = updateTime; - this.memo = memo; - } - -// Bus bus = new Bus( -// null, // 缂栧彿 -// null, // 浠诲姟缂栧彿 -// null, // 寮�濮嬫椂闂� -// null, // 缁撴潫鏃堕棿 -// null, // 杩涘害 -// null, // 鐜妭 -// null, // 鐘舵�乕闈炵┖] -// null, // 鏄惁鍒犻櫎[闈炵┖] -// null, // 绉熸埛 -// null, // 娣诲姞浜哄憳 -// null, // 娣诲姞鏃堕棿[闈炵┖] -// null, // 淇敼浜哄憳 -// null, // 淇敼鏃堕棿 -// null // 澶囨敞 -// ); + @TableField(exist = false) + private List<Long> taskIds; public String getBusSts$(){ BusStsService service = SpringUtils.getBean(BusStsService.class); @@ -166,17 +138,20 @@ } } - 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