Commit 27ae2a4761739a21feca8bad24544fadeff9d227

Authored by smallNorthLee
1 parent 494b80d1

review: 父子类字段调整

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java
@@ -44,8 +44,7 @@ public class BpmModelMetaInfoVO { @@ -44,8 +44,7 @@ public class BpmModelMetaInfoVO {
44 private Integer formType; 44 private Integer formType;
45 @Schema(description = "表单编号", example = "1024") 45 @Schema(description = "表单编号", example = "1024")
46 private Long formId; // formType 为 NORMAL 使用,必须非空 46 private Long formId; // formType 为 NORMAL 使用,必须非空
47 - @Schema(description = "表单名字", example = "请假表单")  
48 - private String formName; 47 +
49 @Schema(description = "表单的配置-JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED) 48 @Schema(description = "表单的配置-JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED)
50 private String formConf; 49 private String formConf;
51 @Schema(description = "表单项的数组-JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED) 50 @Schema(description = "表单项的数组-JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED)
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
@@ -21,6 +21,9 @@ public class BpmModelSaveReqVO extends BpmModelMetaInfoVO { @@ -21,6 +21,9 @@ 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 +
24 @Schema(description = "流程分类", example = "1") 27 @Schema(description = "流程分类", example = "1")
25 private String category; 28 private String category;
26 29
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java
@@ -20,7 +20,10 @@ public class BpmProcessDefinitionRespVO extends BpmModelMetaInfoVO { @@ -20,7 +20,10 @@ 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 = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "easy-build") 23 + @Schema(description = "表单名字", example = "请假表单")
  24 + private String formName;
  25 +
  26 + @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "youdao")
24 private String key; 27 private String key;
25 28
26 @Schema(description = "流程分类", example = "1") 29 @Schema(description = "流程分类", example = "1")
@@ -31,6 +34,9 @@ public class BpmProcessDefinitionRespVO extends BpmModelMetaInfoVO { @@ -31,6 +34,9 @@ public class BpmProcessDefinitionRespVO extends BpmModelMetaInfoVO {
31 @Schema(description = "流程模型的类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") 34 @Schema(description = "流程模型的类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
32 private Integer modelType; // 参见 BpmModelTypeEnum 枚举类 35 private Integer modelType; // 参见 BpmModelTypeEnum 枚举类
33 36
  37 + @Schema(description = "流程模型的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "ABC")
  38 + private String modelId;
  39 +
34 @Schema(description = "中断状态-参见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 40 @Schema(description = "中断状态-参见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
35 private Integer suspensionState; // 参见 SuspensionState 枚举 41 private Integer suspensionState; // 参见 SuspensionState 枚举
36 42