diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/pom.xml b/yudao-module-bpm/yudao-module-bpm-impl-flowable/pom.xml
index 1b039b8cc..9741c5b86 100644
--- a/yudao-module-bpm/yudao-module-bpm-impl-flowable/pom.xml
+++ b/yudao-module-bpm/yudao-module-bpm-impl-flowable/pom.xml
@@ -35,6 +35,19 @@
yudao-spring-boot-starter-test
test
+
+
+ junit
+ junit
+ 4.11
+ test
+
+
+ com.h2database
+ h2
+ 1.4.196
+ test
+
diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/java/cn/iocoder/yudao/module/bpm/AbstractOATest.java b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/java/cn/iocoder/yudao/module/bpm/AbstractOATest.java
new file mode 100644
index 000000000..b16dffdf4
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/java/cn/iocoder/yudao/module/bpm/AbstractOATest.java
@@ -0,0 +1,63 @@
+package cn.iocoder.yudao.module.bpm;
+
+import org.flowable.engine.*;
+import org.flowable.engine.test.FlowableRule;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+
+/**
+ * 抽象测试基类
+ *
+ * @author henryyan cuicui
+ */
+public abstract class AbstractOATest {
+
+ /**
+ * 专门用于测试套件
+ */
+ @Rule
+ public FlowableRule activitiRule = new FlowableRule("flowable.cfg.xml");
+
+ protected ProcessEngine processEngine;
+ protected RepositoryService repositoryService;
+ protected RuntimeService runtimeService;
+ protected TaskService taskService;
+ protected HistoryService historyService;
+ protected IdentityService identityService;
+ protected ManagementService managementService;
+ protected FormService formService;
+
+ /**
+ * 开始测试
+ */
+ @BeforeClass
+ public static void setUpForClass() throws Exception {
+ System.out.println("++++++++ 开始测试 ++++++++");
+ }
+
+ /**
+ * 结束测试
+ */
+ @AfterClass
+ public static void testOverForClass() throws Exception {
+ System.out.println("-------- 结束测试 --------");
+ }
+
+ /**
+ * 初始化变量
+ */
+ @Before
+ public void setUp() throws Exception {
+ processEngine = activitiRule.getProcessEngine();
+ repositoryService = activitiRule.getRepositoryService();
+ runtimeService = activitiRule.getRuntimeService();
+ taskService = activitiRule.getTaskService();
+ historyService = activitiRule.getHistoryService();
+ identityService = activitiRule.getIdentityService();
+ managementService = activitiRule.getManagementService();
+ formService = activitiRule.getFormService();
+ }
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/java/cn/iocoder/yudao/module/bpm/ConditionTest.java b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/java/cn/iocoder/yudao/module/bpm/ConditionTest.java
new file mode 100644
index 000000000..1dd73e712
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/java/cn/iocoder/yudao/module/bpm/ConditionTest.java
@@ -0,0 +1,226 @@
+package cn.iocoder.yudao.module.bpm;
+
+import org.flowable.engine.history.HistoricDetail;
+import org.flowable.engine.history.HistoricFormProperty;
+import org.flowable.engine.history.HistoricProcessInstance;
+import org.flowable.engine.history.HistoricVariableUpdate;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.flowable.engine.test.Deployment;
+import org.flowable.task.api.Task;
+import org.joda.time.DateTime;
+import org.junit.Test;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * 条件测试
+ * 1 某个节点-支付额度需要大于70%
+ * 2 支付条件完成后,开始倒计时15天,要完成流程处理
+ * @author cuicui
+ */
+public class ConditionTest extends AbstractOATest {
+
+ @Test
+ @Deployment(resources = {"chapter6/leave-timeLimit-money/leave-formkey-ext.bpmn", "chapter6/leave-timeLimit-money/leave-start.form",
+ "chapter6/leave-timeLimit-money/approve-deptLeader.form", "chapter6/leave-timeLimit-money/approve-hr.form", "chapter6/leave-timeLimit-money/report-back.form",
+ "chapter6/leave-timeLimit-money/modify-apply.form"})
+ public void allPass() throws Exception {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Map variables = new HashMap();
+ Calendar ca = Calendar.getInstance();
+ String startDate = sdf.format(ca.getTime());
+ ca.add(Calendar.DAY_OF_MONTH, 2); // 当前日期加2天
+ String endDate = sdf.format(ca.getTime());
+
+ // 启动流程
+ variables.put("startDate", startDate);
+ variables.put("endDate", endDate);
+ variables.put("reason", "公休");
+
+ ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().singleResult();
+
+ // 读取启动表单
+ Object renderedStartForm = formService.getRenderedStartForm(processDefinition.getId());
+ assertNotNull(renderedStartForm);
+
+ // 启动流程
+ // 设置当前用户
+ String currentUserId = "henryyan";
+ identityService.setAuthenticatedUserId(currentUserId);
+ ProcessInstance processInstance = formService.submitStartFormData(processDefinition.getId(), variables);
+ assertNotNull(processInstance);
+
+ // 部门领导审批通过
+ Task deptLeaderTask = taskService.createTaskQuery().taskCandidateGroup("deptLeader").singleResult();
+ assertNotNull(formService.getRenderedTaskForm(deptLeaderTask.getId()));
+ variables = new HashMap();
+ variables.put("deptLeaderApproved", "true");
+ formService.submitTaskFormData(deptLeaderTask.getId(), variables);
+
+ // 人事审批通过
+ Task hrTask = taskService.createTaskQuery().taskCandidateGroup("hr").singleResult();
+ assertNotNull(formService.getRenderedTaskForm(hrTask.getId()));
+ variables = new HashMap();
+ variables.put("hrApproved", "true");
+ //手动设置支付金额
+ variables.put("amountMoney", "19999");
+ formService.submitTaskFormData(hrTask.getId(), variables);
+ //判断支付金额是否>1万元
+ // 财务打款通过
+ Task caiwuTask = taskService.createTaskQuery().taskCandidateGroup("caiwu").singleResult();
+ printTask(caiwuTask);
+ taskService.complete(caiwuTask.getId());
+ //判断倒计时15天
+ Task chuNaTask = taskService.createTaskQuery().taskCandidateGroup("chuNa").singleResult();
+ printTask(chuNaTask);
+ taskService.complete(chuNaTask.getId());
+
+ // 销假（根据申请人的用户ID读取）
+// Task reportBackTask = taskService.createTaskQuery().taskAssignee(currentUserId).singleResult();
+// assertNotNull(formService.getRenderedTaskForm(reportBackTask.getId()));
+// variables = new HashMap();
+// variables.put("reportBackDate", sdf.format(ca.getTime()));
+// formService.submitTaskFormData(reportBackTask.getId(), variables);
+
+ // 验证流程是否已经结束
+ HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().finished().singleResult();
+ assertNotNull(historicProcessInstance);
+
+ // 读取历史变量
+ Map historyVariables = packageVariables(processInstance);
+
+ // 验证执行结果
+ assertEquals("ok", historyVariables.get("result"));
+
+ }
+
+ /**
+ * 查询过期任务
+ * @throws Exception
+ */
+ @Test
+ @Deployment(resources = {"chapter6/leave-timeLimit-money/leave-formkey-ext.bpmn", "chapter6/leave-timeLimit-money/leave-start.form",
+ "chapter6/leave-timeLimit-money/approve-deptLeader.form", "chapter6/leave-timeLimit-money/approve-hr.form", "chapter6/leave-timeLimit-money/report-back.form",
+ "chapter6/leave-timeLimit-money/modify-apply.form"})
+ public void dueDate() throws Exception {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Map variables = new HashMap();
+ Calendar ca = Calendar.getInstance();
+ String startDate = sdf.format(ca.getTime());
+ ca.add(Calendar.DAY_OF_MONTH, 2); // 当前日期加2天
+ String endDate = sdf.format(ca.getTime());
+
+ // 启动流程
+ variables.put("startDate", startDate);
+ variables.put("endDate", endDate);
+ variables.put("reason", "公休");
+
+ ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().singleResult();
+
+ // 读取启动表单
+ Object renderedStartForm = formService.getRenderedStartForm(processDefinition.getId());
+ assertNotNull(renderedStartForm);
+
+ // 启动流程
+ // 设置当前用户
+ String currentUserId = "henryyan";
+ identityService.setAuthenticatedUserId(currentUserId);
+ ProcessInstance processInstance = formService.submitStartFormData(processDefinition.getId(), variables);
+ assertNotNull(processInstance);
+
+ // 部门领导审批通过
+ Task deptLeaderTask = taskService.createTaskQuery().taskCandidateGroup("deptLeader").singleResult();
+ assertNotNull(formService.getRenderedTaskForm(deptLeaderTask.getId()));
+ variables = new HashMap();
+ variables.put("deptLeaderApproved", "true");
+ formService.submitTaskFormData(deptLeaderTask.getId(), variables);
+
+ // 人事审批通过
+ Task hrTask = taskService.createTaskQuery().taskCandidateGroup("hr").singleResult();
+ assertNotNull(formService.getRenderedTaskForm(hrTask.getId()));
+ variables = new HashMap();
+ variables.put("hrApproved", "true");
+ //手动设置支付金额
+ variables.put("amountMoney", "19999");
+ formService.submitTaskFormData(hrTask.getId(), variables);
+ //判断支付金额是否>1万元
+ // 财务打款通过
+ Task caiwuTask = taskService.createTaskQuery().taskCandidateGroup("caiwu").singleResult();
+ printTask(caiwuTask);
+
+ //设置5天前就过期了
+ DateTime dateTime = DateTime.now();
+ DateTime minusDays = dateTime.minusDays(5);
+ taskService.setDueDate(caiwuTask.getId(),minusDays.toDate());
+ //查询今天以前的过期任务
+ List listTask = taskService.createTaskQuery().taskDueBefore(new Date()).list();
+ for (Task task : listTask) {
+ printTask(task);
+ }
+
+ // 销假（根据申请人的用户ID读取）
+// Task reportBackTask = taskService.createTaskQuery().taskAssignee(currentUserId).singleResult();
+// assertNotNull(formService.getRenderedTaskForm(reportBackTask.getId()));
+// variables = new HashMap();
+// variables.put("reportBackDate", sdf.format(ca.getTime()));
+// formService.submitTaskFormData(reportBackTask.getId(), variables);
+
+ // 验证流程是否已经结束
+ HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().finished().singleResult();
+ assertNotNull(historicProcessInstance);
+
+ // 读取历史变量
+ Map historyVariables = packageVariables(processInstance);
+
+ // 验证执行结果
+ assertEquals("ok", historyVariables.get("result"));
+
+ }
+
+ /**
+ * 任意流程的跳转
+ */
+ @Test
+ public void taskJump(){
+ // 当前任务
+ String taskId="ddd";
+ Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+ String assignee = "下一个自由跳转人";
+ taskService.setAssignee(taskId,assignee);
+ // 自由跳转
+ String taskDefKey="目标-任务名称";
+ //moveActivityIdTo的两个参数，源任务key,目标任务key
+ runtimeService.createChangeActivityStateBuilder().processInstanceId(task.getProcessInstanceId()).moveActivityIdTo(task.getTaskDefinitionKey(), taskDefKey).changeState();
+
+ }
+
+
+ /**
+ * 读取历史变量并封装到Map中
+ */
+ private Map packageVariables(ProcessInstance processInstance) {
+ Map historyVariables = new HashMap();
+ List list = historyService.createHistoricDetailQuery().processInstanceId(processInstance.getId()).list();
+ for (HistoricDetail historicDetail : list) {
+ if (historicDetail instanceof HistoricFormProperty) {
+ // 表单中的字段
+ HistoricFormProperty field = (HistoricFormProperty) historicDetail;
+ historyVariables.put(field.getPropertyId(), field.getPropertyValue());
+ System.out.println("form field: taskId=" + field.getTaskId() + ", " + field.getPropertyId() + " = " + field.getPropertyValue());
+ } else if (historicDetail instanceof HistoricVariableUpdate) {
+ HistoricVariableUpdate variable = (HistoricVariableUpdate) historicDetail;
+ historyVariables.put(variable.getVariableName(), variable.getValue());
+ System.out.println("variable: " + variable.getVariableName() + " = " + variable.getValue());
+ }
+ }
+ return historyVariables;
+ }
+ private void printTask(Task task){
+ System.out.println(task.getName()+" : " + task.getDueDate());
+ }
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/dynamic-form/leave-dynamic-form-with-javascript.zip b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/dynamic-form/leave-dynamic-form-with-javascript.zip
new file mode 100644
index 000000000..0d5addbdd
Binary files /dev/null and b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/dynamic-form/leave-dynamic-form-with-javascript.zip differ
diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/dynamic-form/leave-dynamic-form.zip b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/dynamic-form/leave-dynamic-form.zip
new file mode 100644
index 000000000..5f66312ad
Binary files /dev/null and b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/dynamic-form/leave-dynamic-form.zip differ
diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/dynamic-form/leave.bpmn b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/dynamic-form/leave.bpmn
new file mode 100644
index 000000000..13a58e9a2
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/dynamic-form/leave.bpmn
@@ -0,0 +1,198 @@
+
+
+
+ 请假流程演示-动态表单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请求被驳回后员工可以选择继续申请，或者取消本次申请
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/dynamic-form/leave.png b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/dynamic-form/leave.png
new file mode 100644
index 000000000..cd36f9855
Binary files /dev/null and b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/dynamic-form/leave.png differ
diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/approve-deptLeader.form b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/approve-deptLeader.form
new file mode 100644
index 000000000..b62459fe0
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/approve-deptLeader.form
@@ -0,0 +1,31 @@
+
+
申请人：
+
${applyUserId}
+
+
审批意见：
+
+
+ 同意
+ 拒绝
+
+
+
+
申请人：
+
${applyUserId}
+
+
审批意见：
+
+
+ 同意
+ 拒绝
+
+
+
+
+ 《Activiti实战》第6章的例子--外置表单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请求被驳回后员工可以选择继续申请，或者取消本次申请
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/leave-formkey.png b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/leave-formkey.png
new file mode 100644
index 000000000..5e8d231a8
Binary files /dev/null and b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/leave-formkey.png differ
diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/leave-formkey.zip b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/leave-formkey.zip
new file mode 100644
index 000000000..f846913b7
Binary files /dev/null and b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/leave-formkey.zip differ
diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/leave-start.form b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/leave-start.form
new file mode 100644
index 000000000..7b6ce7814
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/leave-start.form
@@ -0,0 +1,18 @@
+
+
+
\ No newline at end of file
diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/modify-apply.form b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/modify-apply.form
new file mode 100644
index 000000000..72f326905
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-formkey/modify-apply.form
@@ -0,0 +1,27 @@
+
+
+
+
+
是否继续申请：
+
+
+ 重新申请
+ 结束流程
+
+
+
+
申请人：
+
${applyUserId}
+
+
申请人：
+
${applyUserId}
+
+
审批意见：
+
+
+ 同意
+ 拒绝
+
+
+
+
申请人：
+
${applyUserId}
+
+
审批意见：
+
+
+ 同意
+ 拒绝
+
+
+
+
+ 《Activiti实战》第6章的例子--外置表单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 倒计时30秒
+
+
+ = 10000}]]>
+
+
+
+
+ 请求被驳回后员工可以选择继续申请，或者取消本次申请
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-timeLimit-money/leave-formkey-ext.png b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-timeLimit-money/leave-formkey-ext.png
new file mode 100644
index 000000000..be7e777c8
Binary files /dev/null and b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-timeLimit-money/leave-formkey-ext.png differ
diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-timeLimit-money/leave-start.form b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-timeLimit-money/leave-start.form
new file mode 100644
index 000000000..7b6ce7814
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-timeLimit-money/leave-start.form
@@ -0,0 +1,18 @@
+
+
+
\ No newline at end of file
diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-timeLimit-money/modify-apply.form b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-timeLimit-money/modify-apply.form
new file mode 100644
index 000000000..72f326905
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-impl-flowable/src/test/resources/chapter6/leave-timeLimit-money/modify-apply.form
@@ -0,0 +1,27 @@
+
+
+
+
+
是否继续申请：
+
+
+ 重新申请
+ 结束流程
+
+
+
+
申请人：
+
${applyUserId}
+
+
+
+
+
+
+
+
\ No newline at end of file