From 6b0520d7795796d61054ec31c3c53edacd50218f Mon Sep 17 00:00:00 2001 From: jason <2667446@qq.com> Date: Sun, 25 Aug 2024 23:06:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BF=E9=92=89=E9=92=89=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1-=20=E6=B5=81=E7=A8=8B=E6=8A=84=E9=80=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B=E6=B4=BB=E5=8A=A8=20Id=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/mysql/bpm_update.sql | 6 ++++++ .../admin/task/BpmProcessInstanceController.java | 3 +-- .../dal/dataobject/task/BpmProcessInstanceCopyDO.java | 10 ++++++++-- .../flowable/core/listener/BpmCopyTaskDelegate.java | 2 +- .../service/task/BpmProcessInstanceCopyService.java | 4 +++- .../task/BpmProcessInstanceCopyServiceImpl.java | 7 ++++--- 6 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 sql/mysql/bpm_update.sql diff --git a/sql/mysql/bpm_update.sql b/sql/mysql/bpm_update.sql new file mode 100644 index 0000000000..7327b6cdd3 --- /dev/null +++ b/sql/mysql/bpm_update.sql @@ -0,0 +1,6 @@ +-- ---------------------------- +-- 流程抄送表新加流程活动编号 +-- ---------------------------- +ALTER TABLE `pro-test`.`bpm_process_instance_copy` + ADD COLUMN `activity_id` varchar(64) NULL COMMENT '流程活动编号' AFTER `category`, + MODIFY COLUMN `task_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '任务编号' AFTER `category`; \ No newline at end of file diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java index 56d9dd366f..5ec1e4b137 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java @@ -157,8 +157,7 @@ public class BpmProcessInstanceController { return success(true); } - // TODO @jason：有个 get-form-fields-permission - @GetMapping("/form-fields-permission") + @GetMapping("/get-form-fields-permission") @Operation(summary = "获得流程实例表单字段权限", description = "在【我的流程】菜单中，进行调用") @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')") public CommonResult> getProcessInstanceFormFieldsPermission( diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java index 57e729605d..4ed4bd2f21 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java @@ -48,10 +48,16 @@ public class BpmProcessInstanceCopyDO extends BaseDO { * 冗余 ProcessInstance 的 category 字段 */ private String category; - + /** + * 流程活动编号 + *

+ * 对应 BPMN XML 节点 Id, 用于查询抄送节点的表单字段权限 + * 这里冗余的原因。如果是钉钉易搭的抄送节点 (ServiceTask) 。 使用 taskId 可能查不到对应的 activityId + */ + private String activityId; /** * 任务主键 - * + * // @芋艿 这个 taskId 是不是可以去掉了 * 关联 Task 的 id 属性 */ private String taskId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmCopyTaskDelegate.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmCopyTaskDelegate.java index 9c2341294a..3b9b34e59c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmCopyTaskDelegate.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmCopyTaskDelegate.java @@ -41,7 +41,7 @@ public class BpmCopyTaskDelegate implements JavaDelegate { // 2. 执行抄送 FlowElement currentFlowElement = execution.getCurrentFlowElement(); processInstanceCopyService.createProcessInstanceCopy(userIds, execution.getProcessInstanceId(), - currentFlowElement.getId(), currentFlowElement.getName()); + currentFlowElement.getId(), null, currentFlowElement.getName()); } } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyService.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyService.java index bd9e531ce5..b89f39b317 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyService.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyService.java @@ -26,10 +26,12 @@ public interface BpmProcessInstanceCopyService { * * @param userIds 抄送的用户编号 * @param processInstanceId 流程编号 + * @param activityId 流程活动编号 id (对应 BPMN XML 节点 Id) + * // TODO 芋艿这个 taskId 是不是可以不要了 * @param taskId 任务编号 * @param taskName 任务名称 */ - void createProcessInstanceCopy(Collection userIds, String processInstanceId, String taskId, String taskName); + void createProcessInstanceCopy(Collection userIds, String processInstanceId, String activityId, String taskId, String taskName); /** * 获得抄送的流程的分页 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyServiceImpl.java index 2b110d11d7..a0d61035ea 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyServiceImpl.java @@ -53,11 +53,11 @@ public class BpmProcessInstanceCopyServiceImpl implements BpmProcessInstanceCopy throw exception(ErrorCodeConstants.TASK_NOT_EXISTS); } String processInstanceId = task.getProcessInstanceId(); - createProcessInstanceCopy(userIds, processInstanceId, task.getId(), task.getName()); + createProcessInstanceCopy(userIds, processInstanceId, task.getTaskDefinitionKey(), task.getId(), task.getName()); } @Override - public void createProcessInstanceCopy(Collection userIds, String processInstanceId, String taskId, String taskName) { + public void createProcessInstanceCopy(Collection userIds, String processInstanceId, String activityId, String taskId, String taskName) { // 1.1 校验流程实例存在 ProcessInstance processInstance = processInstanceService.getProcessInstance(processInstanceId); if (processInstance == null) { @@ -74,7 +74,8 @@ public class BpmProcessInstanceCopyServiceImpl implements BpmProcessInstanceCopy List copyList = convertList(userIds, userId -> new BpmProcessInstanceCopyDO() .setUserId(userId).setStartUserId(Long.valueOf(processInstance.getStartUserId())) .setProcessInstanceId(processInstanceId).setProcessInstanceName(processInstance.getName()) - .setCategory(processDefinition.getCategory()).setTaskId(taskId).setTaskName(taskName)); + .setCategory(processDefinition.getCategory()).setActivityId(activityId) + .setTaskId(taskId).setTaskName(taskName)); processInstanceCopyMapper.insertBatch(copyList); }