From 23b688e436a89845e92d861adb5875e625e90d9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 14 三月 2025 11:43:18 +0800
Subject: [PATCH] Merge branch 'dev'
---
business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
index 58d66c2..e5cf83d 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
@@ -1,7 +1,11 @@
package com.ycl.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.system.domain.base.AbsUUIDVo;
import com.ycl.system.domain.base.AbsVo;
import com.ycl.domain.entity.ProjectEngineering;
+
+import java.util.ArrayList;
import java.util.List;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
@@ -18,7 +22,7 @@
*/
@Data
@ApiModel(value = "椤圭洰宸ョ▼鍝嶅簲鏁版嵁", description = "椤圭洰宸ョ▼鍝嶅簲鏁版嵁")
-public class ProjectEngineeringVO extends AbsVo {
+public class ProjectEngineeringVO extends AbsUUIDVo {
/** 椤圭洰id */
@ApiModelProperty("椤圭洰id")
@@ -31,6 +35,21 @@
@ApiModelProperty("宸ョ▼鍚嶇О")
private String projectName;
+ @ApiModelProperty("娴佺▼瀹炰緥id")
+ private String processInsId;
+
+ @ApiModelProperty("娴佺▼瀹氫箟id")
+ private String processDefId;
+
+ @ApiModelProperty("鍙戝竷id")
+ private String deployId;
+
+ @ApiModelProperty("娴佺▼鍚嶇О")
+ private String flowableProcessName;
+
+ @ApiModelProperty("娴佺▼鏄惁鎸傝捣/鏆傚仠")
+ private boolean suspended;
+
/** 椤圭洰鎺ㄨ繘绫诲瀷 */
@ApiModelProperty("椤圭洰鎺ㄨ繘绫诲瀷")
private String projectType;
@@ -43,6 +62,39 @@
@ApiModelProperty("鐘舵��")
private String status;
+ /** 涓荤閮ㄩ棬 */
+ @ApiModelProperty("涓荤閮ㄩ棬")
+ private Long department;
+
+ /** 涓氫富鍗曚綅 */
+ @ApiModelProperty("涓氫富鍗曚綅")
+ private Long projectOwnerUnit;
+ private String projectOwnerUnitName;
+
+ /** 骞翠唤 */
+ @ApiModelProperty("骞翠唤")
+ private String year;
+
+ /** 鐖跺伐绋� */
+ @ApiModelProperty("鐖跺伐绋�")
+ private String parent;
+
+ /** 涓荤閮ㄩ棬 */
+ @ApiModelProperty("涓荤閮ㄩ棬")
+ private Long competentDepartment;
+
+ /** 涓荤閮ㄩ棬 */
+ @ApiModelProperty("涓荤閮ㄩ棬")
+ private String competentDepartmentName;
+
+ /** 涓氫富鍗曚綅鍚嶅瓧 */
+ @ApiModelProperty("涓氫富鍗曚綅鍚嶅瓧")
+ private String unitName;
+
+ /** 宸ョ▼鍒楄〃 */
+ @ApiModelProperty("瀛愬伐绋嬪垪琛�")
+ private List<ProjectEngineeringVO> children = new ArrayList<ProjectEngineeringVO>();
+
public static ProjectEngineeringVO getVoByEntity(@NonNull ProjectEngineering entity, ProjectEngineeringVO vo) {
if(vo == null) {
vo = new ProjectEngineeringVO();
--
Gitblit v1.8.0