szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【功能评审】Bpm：审批签名

This commit is contained in:
YunaiV 2025-01-16 13:12:23 +08:00
parent 56f3177a81
commit 31c2e81dd2
6 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java
View File

@ -119,7 +119,7 @@ public class BpmSimpleModelNodeVO {
@Schema(description = "路由分支组", example = "[]") @Schema(description = "路由分支组", example = "[]")
private List<RouterCondition> routerGroups; private List<RouterCondition> routerGroups;
@Schema(description = "默认分支 ID", example = "Flow_xxx") @Schema(description = "默认分支 ID", example = "Flow_xxx", hidden = true) // 由后端生成，所以 hidden = true
private String defaultFlowId; // 仅用于路由分支节点 BpmSimpleModelNodeType.ROUTER_BRANCH_NODE private String defaultFlowId; // 仅用于路由分支节点 BpmSimpleModelNodeType.ROUTER_BRANCH_NODE
@Schema(description = "任务监听器") @Schema(description = "任务监听器")

3
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailRespVO.java
View File

@ -101,7 +101,8 @@ public class BpmApprovalDetailRespVO {
@Schema(description = "审批意见", example = "同意") @Schema(description = "审批意见", example = "同意")
private String reason; private String reason;
@Schema(description = "签名", example = "http://xxx") // TODO @lesan：改成 signPicUrl 会好点
@Schema(description = "签名", example = "https://www.iocoder.cn/sign.png")
private String sign; private String sign;
} }

3
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
View File

@ -18,7 +18,8 @@ public class BpmTaskApproveReqVO {
@NotEmpty(message = "审批意见不能为空") @NotEmpty(message = "审批意见不能为空")
private String reason; private String reason;
@Schema(description = "签名", example = "http://xxx") // TODO @lesan：改成 signPicUrl 会好点
@Schema(description = "签名", example = "https://www.iocoder.cn/sign.png")
private String sign; private String sign;
@Schema(description = "变量实例（动态表单）", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "变量实例（动态表单）", requiredMode = Schema.RequiredMode.REQUIRED)

1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnVariableConstants.java
View File

@ -59,6 +59,7 @@ public class BpmnVariableConstants {
*/ */
public static final String TASK_VARIABLE_REASON = "TASK_REASON"; public static final String TASK_VARIABLE_REASON = "TASK_REASON";
// TODO @lesan：TASK_SIGN_PIC_URL 。。。虽然长一点，嘿嘿
public static final String TASK_VARIABLE_SIGN = "TASK_SIGN"; public static final String TASK_VARIABLE_SIGN = "TASK_SIGN";
} }

3
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmnModelUtils.java
View File

@ -349,7 +349,8 @@ public class BpmnModelUtils {
} }
public static void addSignEnable(Boolean signEnable, FlowElement userTask) { public static void addSignEnable(Boolean signEnable, FlowElement userTask) {
addExtensionElement(userTask, SIGN_ENABLE, ObjUtil.isNotNull(signEnable) ? signEnable.toString() : "false"); addExtensionElement(userTask, SIGN_ENABLE,
ObjUtil.isNotNull(signEnable) ? signEnable.toString() : Boolean.FALSE.toString());
} }
public static Boolean parseSignEnable(BpmnModel bpmnModel, String flowElementId) { public static Boolean parseSignEnable(BpmnModel bpmnModel, String flowElementId) {

1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/FlowableUtils.java
View File

@ -213,6 +213,7 @@ public class FlowableUtils {
return (String) task.getTaskLocalVariables().get(BpmnVariableConstants.TASK_VARIABLE_REASON); return (String) task.getTaskLocalVariables().get(BpmnVariableConstants.TASK_VARIABLE_REASON);
} }
// TODO @lesan：这个方法名，也改咧
public static String getTaskSign(TaskInfo task) { public static String getTaskSign(TaskInfo task) {
return (String) task.getTaskLocalVariables().get(BpmnVariableConstants.TASK_VARIABLE_SIGN); return (String) task.getTaskLocalVariables().get(BpmnVariableConstants.TASK_VARIABLE_SIGN);
} }