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 | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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 420a280..e5cf83d 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
@@ -35,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;
@@ -47,25 +62,37 @@
@ApiModelProperty("鐘舵��")
private String status;
-
+ /** 涓荤閮ㄩ棬 */
@ApiModelProperty("涓荤閮ㄩ棬")
private Long department;
+ /** 涓氫富鍗曚綅 */
@ApiModelProperty("涓氫富鍗曚綅")
- private Long unit;
+ private Long projectOwnerUnit;
+ private String projectOwnerUnitName;
+ /** 骞翠唤 */
@ApiModelProperty("骞翠唤")
- private Date year;
+ private String year;
+ /** 鐖跺伐绋� */
@ApiModelProperty("鐖跺伐绋�")
private String parent;
- private String departmentName;
+ /** 涓荤閮ㄩ棬 */
+ @ApiModelProperty("涓荤閮ㄩ棬")
+ private Long competentDepartment;
+ /** 涓荤閮ㄩ棬 */
+ @ApiModelProperty("涓荤閮ㄩ棬")
+ private String competentDepartmentName;
+
+ /** 涓氫富鍗曚綅鍚嶅瓧 */
+ @ApiModelProperty("涓氫富鍗曚綅鍚嶅瓧")
private String unitName;
-
- @ApiModelProperty("宸ョ▼鍒楄〃")
+ /** 宸ョ▼鍒楄〃 */
+ @ApiModelProperty("瀛愬伐绋嬪垪琛�")
private List<ProjectEngineeringVO> children = new ArrayList<ProjectEngineeringVO>();
public static ProjectEngineeringVO getVoByEntity(@NonNull ProjectEngineering entity, ProjectEngineeringVO vo) {
--
Gitblit v1.8.0