Commit 9ae18fe53d68ed2331ff9d31f28874ca7db81282
1 parent
44083c96
【问题修复】BPM:formConf、formFields 在 BpmProcessDefinitionRespVO 缺少的问题,导致无法发起流程
Showing
3 changed files
with
7 additions
and
10 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java
| @@ -45,10 +45,6 @@ public class BpmModelMetaInfoVO { | @@ -45,10 +45,6 @@ public class BpmModelMetaInfoVO { | ||
| 45 | @Schema(description = "表单编号", example = "1024") | 45 | @Schema(description = "表单编号", example = "1024") |
| 46 | private Long formId; // formType 为 NORMAL 使用,必须非空 | 46 | private Long formId; // formType 为 NORMAL 使用,必须非空 |
| 47 | 47 | ||
| 48 | - @Schema(description = "表单的配置-JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED) | ||
| 49 | - private String formConf; | ||
| 50 | - @Schema(description = "表单项的数组-JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED) | ||
| 51 | - private List<String> formFields; | ||
| 52 | @Schema(description = "自定义表单的提交路径,使用 Vue 的路由地址", example = "/bpm/oa/leave/create") | 48 | @Schema(description = "自定义表单的提交路径,使用 Vue 的路由地址", example = "/bpm/oa/leave/create") |
| 53 | private String formCustomCreatePath; // 表单类型为 CUSTOM 时,必须非空 | 49 | private String formCustomCreatePath; // 表单类型为 CUSTOM 时,必须非空 |
| 54 | @Schema(description = "自定义表单的查看路径,使用 Vue 的路由地址", example = "/bpm/oa/leave/view") | 50 | @Schema(description = "自定义表单的查看路径,使用 Vue 的路由地址", example = "/bpm/oa/leave/view") |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
| @@ -21,9 +21,6 @@ public class BpmModelSaveReqVO extends BpmModelMetaInfoVO { | @@ -21,9 +21,6 @@ public class BpmModelSaveReqVO extends BpmModelMetaInfoVO { | ||
| 21 | @NotEmpty(message = "流程名称不能为空") | 21 | @NotEmpty(message = "流程名称不能为空") |
| 22 | private String name; | 22 | private String name; |
| 23 | 23 | ||
| 24 | - @Schema(description = "表单名字", example = "请假表单") | ||
| 25 | - private String formName; | ||
| 26 | - | ||
| 27 | @Schema(description = "流程分类", example = "1") | 24 | @Schema(description = "流程分类", example = "1") |
| 28 | private String category; | 25 | private String category; |
| 29 | 26 |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java
| @@ -20,9 +20,6 @@ public class BpmProcessDefinitionRespVO extends BpmModelMetaInfoVO { | @@ -20,9 +20,6 @@ public class BpmProcessDefinitionRespVO extends BpmModelMetaInfoVO { | ||
| 20 | @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 20 | @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") |
| 21 | private String name; | 21 | private String name; |
| 22 | 22 | ||
| 23 | - @Schema(description = "表单名字", example = "请假表单") | ||
| 24 | - private String formName; | ||
| 25 | - | ||
| 26 | @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "youdao") | 23 | @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "youdao") |
| 27 | private String key; | 24 | private String key; |
| 28 | 25 | ||
| @@ -37,6 +34,13 @@ public class BpmProcessDefinitionRespVO extends BpmModelMetaInfoVO { | @@ -37,6 +34,13 @@ public class BpmProcessDefinitionRespVO extends BpmModelMetaInfoVO { | ||
| 37 | @Schema(description = "流程模型的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "ABC") | 34 | @Schema(description = "流程模型的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "ABC") |
| 38 | private String modelId; | 35 | private String modelId; |
| 39 | 36 | ||
| 37 | + @Schema(description = "表单的配置-JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED) | ||
| 38 | + private String formConf; | ||
| 39 | + @Schema(description = "表单项的数组-JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED) | ||
| 40 | + private List<String> formFields; | ||
| 41 | + @Schema(description = "表单名字", example = "请假表单") | ||
| 42 | + private String formName; | ||
| 43 | + | ||
| 40 | @Schema(description = "中断状态-参见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | 44 | @Schema(description = "中断状态-参见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") |
| 41 | private Integer suspensionState; // 参见 SuspensionState 枚举 | 45 | private Integer suspensionState; // 参见 SuspensionState 枚举 |
| 42 | 46 |