fix(流程模型和部署): 修改流程模型设计方案,模型信息和流程图分开操作,表单在开始节点设置。

This commit is contained in:
konbai
2022-07-19 20:59:32 +08:00
parent 0ae300919d
commit 8acdf651a9
20 changed files with 609 additions and 571 deletions

View File

@@ -16,6 +16,11 @@ import lombok.Data;
public class WfDeployForm {
private static final long serialVersionUID = 1L;
/**
* 表单主键
*/
private String formKey;
/**
* 流程定义主键
*/

View File

@@ -1,5 +1,7 @@
package com.ruoyi.workflow.domain.bo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,33 +18,31 @@ import javax.validation.constraints.NotNull;
public class WfModelBo {
@ApiModelProperty(value = "模型主键")
@NotNull(message = "模型主键不能为空", groups = { EditGroup.class })
private String modelId;
@ApiModelProperty(value = "模型名称", required = true)
@NotNull(message = "模型名称不能为空")
@NotNull(message = "模型名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String modelName;
@ApiModelProperty(value = "模型Key", required = true)
@NotNull(message = "模型Key不能为空")
@NotNull(message = "模型Key不能为空", groups = { AddGroup.class, EditGroup.class })
private String modelKey;
@ApiModelProperty(value = "流程分类", required = true)
@NotBlank(message = "流程分类不能为空")
@NotBlank(message = "流程分类不能为空", groups = { AddGroup.class, EditGroup.class })
private String category;
@ApiModelProperty(value = "描述")
private String description;
@ApiModelProperty(value = "表单类型", required = true)
@NotBlank(message = "表单类型不能为空")
private Integer formType;
@ApiModelProperty(value = "表单主键", required = true)
@NotBlank(message = "表单不能为空")
private Long formId;
@ApiModelProperty(value = "流程xml", required = true)
@NotBlank(message = "流程xml不能为空")
private String bpmnXml;
@ApiModelProperty(value = "是否保存为新版本", required = true)

View File

@@ -9,6 +9,11 @@ import lombok.Data;
@Data
public class WfMetaInfoDto {
/**
* 创建者username
*/
private String createUser;
/**
* 流程描述
*/