From 773d9314b7f1bf4dce390bf8fa0b6a9b12e32344 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期日, 25 六月 2023 14:25:43 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java | 84 +++++------------------------------------- 1 files changed, 10 insertions(+), 74 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 164824e..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,5 +1,6 @@ package com.vci.ubcs.omd.vo; +import com.vci.ubcs.omd.entity.LifeCycleRule; import lombok.Data; import java.util.Date; @@ -11,85 +12,20 @@ * @date 2023/4/3 */ @Data -public class LifeCycleVO implements java.io.Serializable{ +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; + /** + * 杩炴帴绾� + */ + private List<LifeCycleEdgeVO> edges; } -- Gitblit v1.9.3