From ed8fc5f674544d3af63c6f68093ffc038385c493 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 16 十二月 2024 09:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java
index 90e4f0f..d429b89 100644
--- a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java
+++ b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java
@@ -1,5 +1,7 @@
package com.iailab.module.bpm.controller.admin.task.vo.task;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iailab.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
import com.iailab.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -15,7 +17,7 @@
@Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id;
- @Schema(description = "任务名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "平台")
+ @Schema(description = "任务名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -33,14 +35,21 @@
@Schema(description = "审批理由", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
private String reason;
+ @Schema(description = "任务负责人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2048")
+ @JsonIgnore // 不返回，只是方便后续读取，赋值给 ownerUser
+ private Long owner;
/**
* 负责人的用户信息
*/
- private BpmProcessInstanceRespVO.User ownerUser;
+ private UserSimpleBaseVO ownerUser;
+
+ @Schema(description = "任务分配人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2048")
+ @JsonIgnore // 不返回，只是方便后续读取，赋值给 assigneeUser
+ private Long assignee;
/**
* 审核的用户信息
*/
- private BpmProcessInstanceRespVO.User assigneeUser;
+ private UserSimpleBaseVO assigneeUser;
@Schema(description = "任务定义的标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "Activity_one")
private String taskDefinitionKey;
@@ -55,18 +64,20 @@
@Schema(description = "父任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String parentTaskId;
@Schema(description = "子任务列表（由加签生成）", requiredMode = Schema.RequiredMode.REQUIRED, example = "childrenTask")
- private List<BpmTaskRespVO> children;
+ private List<BpmTaskRespVO> children; // 由加签生成，包含多层子任务
@Schema(description = "表单编号", example = "1024")
private Long formId;
@Schema(description = "表单名字", example = "请假表单")
private String formName;
- @Schema(description = "表单的配置-JSON 字符串")
+ @Schema(description = "表单的配置，JSON 字符串")
private String formConf;
@Schema(description = "表单项的数组")
private List<String> formFields;
@Schema(description = "提交的表单值", requiredMode = Schema.RequiredMode.REQUIRED)
private Map<String, Object> formVariables;
+ @Schema(description = "操作按钮设置值")
+ private Map<Integer, OperationButtonSetting> buttonsSetting;
@Data
@Schema(description = "流程实例")
@@ -75,7 +86,7 @@
@Schema(description = "流程实例编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id;
- @Schema(description = "流程实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "平台")
+ @Schema(description = "流程实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name;
@Schema(description = "提交时间", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -87,8 +98,20 @@
/**
* 发起人的用户信息
*/
- private BpmProcessInstanceRespVO.User startUser;
+ private UserSimpleBaseVO startUser;
}
+ @Data
+ @Schema(description = "操作按钮设置")
+ public static class OperationButtonSetting {
+
+ @Schema(description = "显示名称", example = "审批")
+ private String displayName;
+
+ @Schema(description = "是否启用", example = "true")
+ private Boolean enable;
+ }
+
+
}
--
Gitblit v1.9.3