xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-11-04 16:23:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add 增加条件表达式示例

Browse Source 
fix 修复提交修改变量参数没有覆盖变量问题
This commit is contained in:
gssong
2025-03-08 00:35:57 +08:00
parent 23245b78ca
commit 5a4be5fba1
4 changed files with 16 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
View File

@@ -374,6 +374,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
Instance instance = insService.getById(instanceId);
if (instance != null) {
taskService.mergeVariable(instance, variable);
insService.updateById(instance);
}
}

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
View File

@@ -110,6 +110,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
if (ObjectUtil.isNotNull(flowInstance)) {
BusinessStatusEnum.checkStartStatus(flowInstance.getFlowStatus());
List<Task> taskList = taskService.list(new FlowTask().setInstanceId(flowInstance.getId()));
taskService.mergeVariable(flowInstance, variables);
insService.updateById(flowInstance);
StartProcessReturnDTO dto = new StartProcessReturnDTO();
dto.setProcessInstanceId(taskList.get(0).getInstanceId());
dto.setTaskId(taskList.get(0).getId());

13
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
View File

@@ -47,6 +47,19 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
private final TestLeaveMapper baseMapper;
private final WorkflowService workflowService;
/**
* spel条件表达：判断小于2
*
* @param leaveDays 待判断的变量（可不传自行返回true或false）
* @return boolean
*/
public boolean eval(Integer leaveDays) {
if (leaveDays < 2) {
return true;
}
return false;
}
/**
* 查询请假
*/

211
script/leave/leave6.json
View File

@@ -1,211 +0,0 @@
{
"flowCode" : "leave6",
"flowName" : "请假申请-排他并行会签",
"category" : "100",
"version" : "1",
"formCustom" : "N",
"formPath" : "/workflow/leaveEdit/index",
"nodeList" : [ {
"nodeType" : 0,
"nodeCode" : "122b89a5-7c6f-40a3-aa09-7a263f902054",
"nodeName" : "开始",
"nodeRatio" : 0.000,
"coordinate" : "240,300|240,300",
"formCustom" : "N",
"ext" : "[]",
"skipList" : [ {
"nowNodeCode" : "122b89a5-7c6f-40a3-aa09-7a263f902054",
"nextNodeCode" : "c25a0e86-fdd1-4f03-8e22-14db70389dbd",
"skipType" : "PASS",
"coordinate" : "260,300;350,300"
} ]
}, {
"nodeType" : 1,
"nodeCode" : "c25a0e86-fdd1-4f03-8e22-14db70389dbd",
"nodeName" : "申请人",
"nodeRatio" : 0.000,
"coordinate" : "400,300|400,300",
"ext" : "[{\"code\":\"enum:org.dromara.workflow.common.enums.ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
"skipList" : [ {
"nowNodeCode" : "c25a0e86-fdd1-4f03-8e22-14db70389dbd",
"nextNodeCode" : "07ecda1d-7a0a-47b5-8a91-6186c9473742",
"skipType" : "PASS",
"coordinate" : "450,300;510,300"
} ]
}, {
"nodeType" : 1,
"nodeCode" : "2bfa3919-78cf-4bc1-b59b-df463a4546f9",
"nodeName" : "副经理",
"permissionFlag" : "role:1@@role:3@@role:4",
"nodeRatio" : 0.000,
"coordinate" : "860,200|860,200",
"ext" : "[{\"code\":\"enum:org.dromara.workflow.common.enums.ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
"skipList" : [ {
"nowNodeCode" : "2bfa3919-78cf-4bc1-b59b-df463a4546f9",
"nextNodeCode" : "394e1cc8-b8b2-4189-9f81-44448e88ac32",
"skipType" : "PASS",
"coordinate" : "910,200;1000,200;1000,275"
} ]
}, {
"nodeType" : 1,
"nodeCode" : "ec17f60e-94e0-4d96-a3ce-3417e9d32d60",
"nodeName" : "组长",
"permissionFlag" : "1",
"nodeRatio" : 0.000,
"coordinate" : "860,400|860,400",
"formCustom" : "N",
"ext" : "[{\"code\":\"enum:org.dromara.workflow.common.enums.ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
"skipList" : [ {
"nowNodeCode" : "ec17f60e-94e0-4d96-a3ce-3417e9d32d60",
"nextNodeCode" : "394e1cc8-b8b2-4189-9f81-44448e88ac32",
"skipType" : "PASS",
"coordinate" : "910,400;1000,400;1000,325"
} ]
}, {
"nodeType" : 1,
"nodeCode" : "07ecda1d-7a0a-47b5-8a91-6186c9473742",
"nodeName" : "副组长",
"permissionFlag" : "1",
"nodeRatio" : 0.000,
"coordinate" : "560,300|560,300",
"ext" : "[{\"code\":\"enum:org.dromara.workflow.common.enums.ButtonPermissionEnum\",\"value\":\"back,termination,copy,trust,transfer\"}]",
"skipList" : [ {
"nowNodeCode" : "07ecda1d-7a0a-47b5-8a91-6186c9473742",
"nextNodeCode" : "48117e2c-6328-406b-b102-c4a9d115bb13",
"skipType" : "PASS",
"coordinate" : "610,300;675,300"
} ]
}, {
"nodeType" : 3,
"nodeCode" : "48117e2c-6328-406b-b102-c4a9d115bb13",
"nodeRatio" : 0.000,
"coordinate" : "700,300",
"formCustom" : "N",
"ext" : "[]",
"skipList" : [ {
"nowNodeCode" : "48117e2c-6328-406b-b102-c4a9d115bb13",
"nextNodeCode" : "2bfa3919-78cf-4bc1-b59b-df463a4546f9",
"skipName" : "大于两天",
"skipType" : "PASS",
"skipCondition" : "gt@@leaveDays|2",
"coordinate" : "700,275;700,200;810,200|700,237"
}, {
"nowNodeCode" : "48117e2c-6328-406b-b102-c4a9d115bb13",
"nextNodeCode" : "ec17f60e-94e0-4d96-a3ce-3417e9d32d60",
"skipType" : "PASS",
"coordinate" : "700,325;700,400;810,400"
} ]
}, {
"nodeType" : 3,
"nodeCode" : "394e1cc8-b8b2-4189-9f81-44448e88ac32",
"nodeRatio" : 0.000,
"coordinate" : "1000,300",
"formCustom" : "N",
"ext" : "[]",
"skipList" : [ {
"nowNodeCode" : "394e1cc8-b8b2-4189-9f81-44448e88ac32",
"nextNodeCode" : "9c93a195-cff2-4e17-ab0a-a4f264191496",
"skipType" : "PASS",
"coordinate" : "1025,300;1130,300"
} ]
}, {
"nodeType" : 1,
"nodeCode" : "9c93a195-cff2-4e17-ab0a-a4f264191496",
"nodeName" : "经理会签",
"permissionFlag" : "1@@3",
"nodeRatio" : 100.000,
"coordinate" : "1180,300|1180,300",
"formCustom" : "N",
"ext" : "[{\"code\":\"enum:org.dromara.workflow.common.enums.ButtonPermissionEnum\",\"value\":\"back,termination,pop,addSign,subSign\"}]",
"skipList" : [ {
"nowNodeCode" : "9c93a195-cff2-4e17-ab0a-a4f264191496",
"nextNodeCode" : "a1a42056-afd1-4e90-88bc-36cbf5a66992",
"skipType" : "PASS",
"coordinate" : "1230,300;1315,300"
} ]
}, {
"nodeType" : 4,
"nodeCode" : "a1a42056-afd1-4e90-88bc-36cbf5a66992",
"nodeRatio" : 0.000,
"coordinate" : "1340,300",
"formCustom" : "N",
"ext" : "[]",
"skipList" : [ {
"nowNodeCode" : "a1a42056-afd1-4e90-88bc-36cbf5a66992",
"nextNodeCode" : "fcfdd9f6-f526-4c1a-b71d-88afa31aebc5",
"skipType" : "PASS",
"coordinate" : "1340,325;1340,400;1430,400"
}, {
"nowNodeCode" : "a1a42056-afd1-4e90-88bc-36cbf5a66992",
"nextNodeCode" : "350dfa0c-a77c-4efa-8527-10efa02d8be4",
"skipType" : "PASS",
"coordinate" : "1340,275;1340,200;1430,200"
} ]
}, {
"nodeType" : 1,
"nodeCode" : "350dfa0c-a77c-4efa-8527-10efa02d8be4",
"nodeName" : "总经理",
"permissionFlag" : "3@@1",
"nodeRatio" : 0.000,
"coordinate" : "1480,200|1480,200",
"formCustom" : "N",
"ext" : "[{\"code\":\"enum:org.dromara.workflow.common.enums.ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
"skipList" : [ {
"nowNodeCode" : "350dfa0c-a77c-4efa-8527-10efa02d8be4",
"nextNodeCode" : "c36a46ef-04f9-463f-bad7-4b395c818519",
"skipType" : "PASS",
"coordinate" : "1530,200;1640,200;1640,275"
} ]
}, {
"nodeType" : 1,
"nodeCode" : "fcfdd9f6-f526-4c1a-b71d-88afa31aebc5",
"nodeName" : "副总经理",
"permissionFlag" : "1@@3",
"nodeRatio" : 0.000,
"coordinate" : "1480,400|1480,400",
"formCustom" : "N",
"ext" : "[{\"code\":\"enum:org.dromara.workflow.common.enums.ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
"skipList" : [ {
"nowNodeCode" : "fcfdd9f6-f526-4c1a-b71d-88afa31aebc5",
"nextNodeCode" : "c36a46ef-04f9-463f-bad7-4b395c818519",
"skipType" : "PASS",
"coordinate" : "1530,400;1640,400;1640,325"
} ]
}, {
"nodeType" : 4,
"nodeCode" : "c36a46ef-04f9-463f-bad7-4b395c818519",
"nodeRatio" : 0.000,
"coordinate" : "1640,300",
"formCustom" : "N",
"ext" : "[]",
"skipList" : [ {
"nowNodeCode" : "c36a46ef-04f9-463f-bad7-4b395c818519",
"nextNodeCode" : "3fcea762-b53a-4ae1-8365-7bec90444828",
"skipType" : "PASS",
"coordinate" : "1665,300;1770,300"
} ]
}, {
"nodeType" : 1,
"nodeCode" : "3fcea762-b53a-4ae1-8365-7bec90444828",
"nodeName" : "董事",
"permissionFlag" : "1",
"nodeRatio" : 0.000,
"coordinate" : "1820,300|1820,300",
"formCustom" : "N",
"ext" : "[{\"code\":\"enum:org.dromara.workflow.common.enums.ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
"skipList" : [ {
"nowNodeCode" : "3fcea762-b53a-4ae1-8365-7bec90444828",
"nextNodeCode" : "9cfbfd3e-6c04-41d6-9fc2-6787a7d2cd31",
"skipType" : "PASS",
"coordinate" : "1870,300;1960,300"
} ]
}, {
"nodeType" : 2,
"nodeCode" : "9cfbfd3e-6c04-41d6-9fc2-6787a7d2cd31",
"nodeName" : "结束",
"nodeRatio" : 0.000,
"coordinate" : "1980,300|1980,300",
"formCustom" : "N",
"ext" : "[]"
} ]
}