From 4496cc4b1f17c4b3de5e954388baeadf04de719d Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 29 十一月 2023 14:49:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java | 232 +++------------------------------------------------------
1 files changed, 15 insertions(+), 217 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java
index b6b0bdb..5813a75 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java
@@ -1,233 +1,31 @@
package com.vci.ubcs.omd.vo;
+import com.vci.ubcs.omd.entity.LifeCycleRule;
+import lombok.Data;
+
import java.util.Date;
import java.util.List;
/**
* 鐢熷懡鍛ㄦ湡鏄剧ず瀵硅薄
- * @author weidy
- * @date 2019/10/11 4:45 PM
+ * @author LiHang
+ * @date 2023/4/3
*/
-public class LifeCycleVO implements java.io.Serializable{
+@Data
+public class LifeCycleVO extends LifeCycleRule {
/**
* 绂佹淇敼杩欎釜鍊�
*/
private static final long serialVersionUID = 5567711696707791107L;
- /**
- * 涓婚敭
- */
- private String oid;
+ /**
+ * 鑺傜偣
+ */
+ private List<LifeCycleNodeVO> nodes;
- /**
- * 鐢熷懡鍛ㄦ湡缂栧彿
- */
- private String id;
-
- /**
- * 鐢熷懡鍛ㄦ湡鍚嶇О
- */
- private String name;
-
- /**
- * 鎻忚堪
- */
- private String description;
-
- /**
- * 绫荤殑鍏ㄨ矾寰�
- */
- private String classFullName;
-
- /**
- * 璧峰鐘舵��
- */
- private String startStatus;
-
- /**
- * 璧峰鐘舵�佸悕绉�
- */
- private String startStatusName;
-
- /**
- * 涓氬姟绫诲瀷鍚嶇О
- */
- private String btmname;
-
- /**
- * 鎷ユ湁鑰�
- */
- private String owner;
-
- /**
- * 鍒涘缓浜�
- */
- private String creator;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
- /**
- * 鏈�鍚庝慨鏀逛汉
- */
- private String lastModifier;
-
- /**
- * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
- */
- private Date lastModifyTime;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
-
- /**
- * 鍖呭惈杩炴帴绾�
- */
- private List<LifeCycleLineVO> lines ;
-
- public String getClassFullName() {
- return classFullName;
- }
-
- public void setClassFullName(String classFullName) {
- this.classFullName = classFullName;
- }
-
- public String getBtmname() {
- return btmname;
- }
-
- public void setBtmname(String btmname) {
- this.btmname = btmname;
- }
-
- public String getOwner() {
- return owner;
- }
-
- public void setOwner(String owner) {
- this.owner = owner;
- }
-
- public String getOid() {
- return oid;
- }
-
- public void setOid(String oid) {
- this.oid = oid;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getStartStatus() {
- return startStatus;
- }
-
- public void setStartStatus(String startStatus) {
- this.startStatus = startStatus;
- }
-
- public String getStartStatusName() {
- return startStatusName;
- }
-
- public void setStartStatusName(String startStatusName) {
- this.startStatusName = startStatusName;
- }
-
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getLastModifier() {
- return lastModifier;
- }
-
- public void setLastModifier(String lastModifier) {
- this.lastModifier = lastModifier;
- }
-
- public Date getLastModifyTime() {
- return lastModifyTime;
- }
-
- public void setLastModifyTime(Date lastModifyTime) {
- this.lastModifyTime = lastModifyTime;
- }
-
- public Date getTs() {
- return ts;
- }
-
- public void setTs(Date ts) {
- this.ts = ts;
- }
-
- public List<LifeCycleLineVO> getLines() {
- return lines;
- }
-
- public void setLines(List<LifeCycleLineVO> lines) {
- this.lines = lines;
- }
-
- @Override
- public String toString() {
- return "OsLifeCycleVO{" +
- "oid='" + oid + '\'' +
- ", id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", description='" + description + '\'' +
- ", classFullName='" + classFullName + '\'' +
- ", startStatus='" + startStatus + '\'' +
- ", startStatusName='" + startStatusName + '\'' +
- ", btmname='" + btmname + '\'' +
- ", owner='" + owner + '\'' +
- ", creator='" + creator + '\'' +
- ", createTime=" + createTime +
- ", lastModifier='" + lastModifier + '\'' +
- ", lastModifyTime=" + lastModifyTime +
- ", ts=" + ts +
- ", lines=" + lines +
- '}';
- }
+ /**
+ * 杩炴帴绾�
+ */
+ private List<LifeCycleEdgeVO> edges;
}
--
Gitblit v1.9.3