From 8dabc3913e1f695e2901820f81c664a8ee9ced97 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Sat, 20 Dec 2025 18:01:57 +0800 Subject: [PATCH] commit --- .../controller/FlowTodoCenterController.java | 8 ++++++-- .../budwk/app/flow/engine/model/TaskModel.java | 2 ++ .../budwk/app/flow/engine/parser/NodeParser.java | 1 + .../app/flow/engine/parser/impl/TaskParser.java | 1 + .../com/budwk/app/flow/entity/ProcessTask.java | 4 ++++ .../service/impl/ProcessTaskServiceImpl.java | 1 + src/main/resources/views/layouts/v4/home/user.js | 1 + .../views/platform/flow/design/designer.html | 16 ++++++++++------ .../views/platform/zhghh5/sys/home/todo.js | 7 +++---- 9 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java b/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java index 42d67b6..7b409ce 100644 --- a/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java +++ b/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java @@ -48,6 +48,7 @@ public class FlowTodoCenterController { t.displayName AS taskName, t.taskState, t.formKey, + t.h5FormKey, t.createdAt, t.finishTime, t.variable, @@ -92,6 +93,7 @@ public class FlowTodoCenterController { t.displayName AS taskName, t.taskState, t.formKey, + t.h5FormKey, t.createdAt, t.finishTime, t.variable, @@ -140,7 +142,9 @@ public class FlowTodoCenterController { ins.createdAt, ins.variable ->> '$.instanceName' AS instanceName, GROUP_CONCAT(DISTINCT t.displayName) as taskName, - cat.`name` categoryName + cat.`name` categoryName, + t.formKey, + t.h5FormKey FROM wf_process_instance ins LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id and t.taskState = 10 @@ -179,7 +183,7 @@ public class FlowTodoCenterController { ins.variable, ins.createdAt, ins.variable ->> '$.instanceName' AS instanceName, - cat.`name` categoryName + cat.`name` categoryName FROM wf_process_instance ins LEFT JOIN wf_process_define def ON def.id = ins.processDefineId diff --git a/src/main/java/com/budwk/app/flow/engine/model/TaskModel.java b/src/main/java/com/budwk/app/flow/engine/model/TaskModel.java index 84d521d..d03c1d2 100644 --- a/src/main/java/com/budwk/app/flow/engine/model/TaskModel.java +++ b/src/main/java/com/budwk/app/flow/engine/model/TaskModel.java @@ -41,6 +41,8 @@ public class TaskModel extends NodeModel { */ private String countersignCompletionCondition; + private String h5form; + @Override public void exec(Execution execution) { // 执行任务节点自定义执行逻辑 diff --git a/src/main/java/com/budwk/app/flow/engine/parser/NodeParser.java b/src/main/java/com/budwk/app/flow/engine/parser/NodeParser.java index 9e37150..0bac1f3 100644 --- a/src/main/java/com/budwk/app/flow/engine/parser/NodeParser.java +++ b/src/main/java/com/budwk/app/flow/engine/parser/NodeParser.java @@ -21,6 +21,7 @@ public interface NodeParser { String EXPR_KEY = "expr"; // 表达式key String HANDLE_CLASS_KEY = "handleClass"; // 表达式处理类 String FORM_KEY = "form"; // 表单标识 + String H5_FORM_KEY = "h5form"; // 表单标识 String ASSIGNEE_KEY = "assignee"; // 参与人 String ASSIGNMENT_HANDLE_KEY = "assignmentHandler"; // 参与人处理类 String TASK_TYPE_KEY = "taskType"; // 任务类型(主办/协办) diff --git a/src/main/java/com/budwk/app/flow/engine/parser/impl/TaskParser.java b/src/main/java/com/budwk/app/flow/engine/parser/impl/TaskParser.java index 314e24a..9424d27 100644 --- a/src/main/java/com/budwk/app/flow/engine/parser/impl/TaskParser.java +++ b/src/main/java/com/budwk/app/flow/engine/parser/impl/TaskParser.java @@ -29,6 +29,7 @@ public class TaskParser extends AbstractNodeParser { TaskModel taskModel = (TaskModel)nodeModel; Dict properties = lfNode.getProperties(); taskModel.setForm(properties.getStr(FORM_KEY)); + taskModel.setH5form(properties.getStr(H5_FORM_KEY)); taskModel.setAssignee(properties.getStr(ASSIGNEE_KEY)); taskModel.setAssignmentHandler(properties.getStr(ASSIGNMENT_HANDLE_KEY)); taskModel.setTaskType(ProcessTaskTypeEnum.codeOf(properties.get(TASK_TYPE_KEY))); diff --git a/src/main/java/com/budwk/app/flow/entity/ProcessTask.java b/src/main/java/com/budwk/app/flow/entity/ProcessTask.java index 072cadf..406361b 100644 --- a/src/main/java/com/budwk/app/flow/entity/ProcessTask.java +++ b/src/main/java/com/budwk/app/flow/entity/ProcessTask.java @@ -66,6 +66,10 @@ public class ProcessTask extends BaseModel { @Column private String formKey; + @Comment("h5任务处理表单KEY") + @Column + private String h5FormKey; + @Comment("父任务ID") @Column private Long taskParentId; diff --git a/src/main/java/com/budwk/app/flow/service/impl/ProcessTaskServiceImpl.java b/src/main/java/com/budwk/app/flow/service/impl/ProcessTaskServiceImpl.java index 5c663a5..a80acf7 100644 --- a/src/main/java/com/budwk/app/flow/service/impl/ProcessTaskServiceImpl.java +++ b/src/main/java/com/budwk/app/flow/service/impl/ProcessTaskServiceImpl.java @@ -174,6 +174,7 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl impleme processTask.setTaskState(ProcessTaskStateEnum.DOING.getCode()); processTask.setTaskType(taskModel.getTaskType().getCode()); processTask.setFormKey(taskModel.getForm()); + processTask.setH5FormKey(taskModel.getH5form()); processTask.setProcessInstanceId(execution.getProcessInstanceId()); // 增加是否为第一个任务节点标识 diff --git a/src/main/resources/views/layouts/v4/home/user.js b/src/main/resources/views/layouts/v4/home/user.js index 0944fe1..ba5c538 100644 --- a/src/main/resources/views/layouts/v4/home/user.js +++ b/src/main/resources/views/layouts/v4/home/user.js @@ -108,6 +108,7 @@ const user = { + diff --git a/src/main/resources/views/platform/flow/design/designer.html b/src/main/resources/views/platform/flow/design/designer.html index 87c2aac..86e28ef 100644 --- a/src/main/resources/views/platform/flow/design/designer.html +++ b/src/main/resources/views/platform/flow/design/designer.html @@ -39,14 +39,18 @@ 'assigneeText', 'assigneeMode', 'buttonConfig', - 'enableNextOperator' + 'enableNextOperator', + 'h5form' ]" > - - - - - +