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/Bus.java | 80 +++++++++++++--------------------------
1 files changed, 27 insertions(+), 53 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 9dfb9cf..393e8dc 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;
/**
* 寮�濮嬫椂闂�
@@ -77,13 +79,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -95,7 +97,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -109,41 +111,14 @@
@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,Integer tenantId,Integer createBy,Date createTime,Integer 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;
- }
+ @TableField(exist = false)
+ private int tasksNumTotal = 0;
-// 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);
@@ -154,29 +129,28 @@
return null;
}
- public String getStatus$(){
+
+ public String getBusStsEl(){
+ BusStsService service = SpringUtils.getBean(BusStsService.class);
+ BusSts busSts = service.getById(this.busSts);
+ if (!Cools.isEmpty(busSts)){
+ return String.valueOf(busSts.getUuid());
+ }
+ return null;
+ }
+
+ 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.status);
+ return null;
}
}
- public String getDeleted$(){
- if (null == this.deleted){ return null; }
- switch (this.deleted){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.deleted);
- }
- }
}
--
Gitblit v1.9.1