Commit 987bf3ebe9d1f7348204d08fd2f12363d3960278
Committed by
Gitee
!1161 同步最新的 bpm 改动
Merge pull request !1161 from 芋道源码/feature/bpm
Showing
13 changed files
with
819 additions
and
42 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskPageReqVO.java
| @@ -4,8 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; | @@ -4,8 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; | ||
| 4 | import cn.iocoder.yudao.framework.common.util.date.DateUtils; | 4 | import cn.iocoder.yudao.framework.common.util.date.DateUtils; |
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | -import lombok.EqualsAndHashCode; | ||
| 8 | -import lombok.ToString; | ||
| 9 | import org.springframework.format.annotation.DateTimeFormat; | 7 | import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 8 | ||
| 11 | import java.time.LocalDateTime; | 9 | import java.time.LocalDateTime; |
| @@ -17,6 +15,9 @@ public class BpmTaskPageReqVO extends PageParam { | @@ -17,6 +15,9 @@ public class BpmTaskPageReqVO extends PageParam { | ||
| 17 | @Schema(description = "流程任务名", example = "芋道") | 15 | @Schema(description = "流程任务名", example = "芋道") |
| 18 | private String name; | 16 | private String name; |
| 19 | 17 | ||
| 18 | + @Schema(description = "流程分类", example = "1") | ||
| 19 | + private String category; | ||
| 20 | + | ||
| 20 | @Schema(description = "创建时间") | 21 | @Schema(description = "创建时间") |
| 21 | @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | 22 | @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
| 22 | private LocalDateTime[] createTime; | 23 | private LocalDateTime[] createTime; |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
| @@ -124,12 +124,18 @@ public interface BpmTaskConvert { | @@ -124,12 +124,18 @@ public interface BpmTaskConvert { | ||
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | default BpmTaskRespVO buildTodoTask(Task todoTask, List<Task> childrenTasks, | 126 | default BpmTaskRespVO buildTodoTask(Task todoTask, List<Task> childrenTasks, |
| 127 | - Map<Integer, BpmTaskRespVO.OperationButtonSetting> buttonsSetting) { | ||
| 128 | - return BeanUtils.toBean(todoTask, BpmTaskRespVO.class) | 127 | + Map<Integer, BpmTaskRespVO.OperationButtonSetting> buttonsSetting, |
| 128 | + BpmFormDO form) { | ||
| 129 | + BpmTaskRespVO bpmTaskRespVO = BeanUtils.toBean(todoTask, BpmTaskRespVO.class) | ||
| 129 | .setStatus(FlowableUtils.getTaskStatus(todoTask)).setReason(FlowableUtils.getTaskReason(todoTask)) | 130 | .setStatus(FlowableUtils.getTaskStatus(todoTask)).setReason(FlowableUtils.getTaskReason(todoTask)) |
| 130 | .setButtonsSetting(buttonsSetting) | 131 | .setButtonsSetting(buttonsSetting) |
| 131 | .setChildren(convertList(childrenTasks, childTask -> BeanUtils.toBean(childTask, BpmTaskRespVO.class) | 132 | .setChildren(convertList(childrenTasks, childTask -> BeanUtils.toBean(childTask, BpmTaskRespVO.class) |
| 132 | .setStatus(FlowableUtils.getTaskStatus(childTask)))); | 133 | .setStatus(FlowableUtils.getTaskStatus(childTask)))); |
| 134 | + if (form != null) { | ||
| 135 | + bpmTaskRespVO.setFormId(form.getId()).setFormName(form.getName()) | ||
| 136 | + .setFormConf(form.getConf()).setFormFields(form.getFields()); | ||
| 137 | + } | ||
| 138 | + return bpmTaskRespVO; | ||
| 133 | } | 139 | } |
| 134 | 140 | ||
| 135 | default BpmMessageSendWhenTaskCreatedReqDTO convert(ProcessInstance processInstance, AdminUserRespDTO startUser, | 141 | default BpmMessageSendWhenTaskCreatedReqDTO convert(ProcessInstance processInstance, AdminUserRespDTO startUser, |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java
| @@ -54,13 +54,13 @@ public class BpmParallelMultiInstanceBehavior extends ParallelMultiInstanceBehav | @@ -54,13 +54,13 @@ public class BpmParallelMultiInstanceBehavior extends ParallelMultiInstanceBehav | ||
| 54 | Set<Long> assigneeUserIds = (Set<Long>) execution.getVariable(super.collectionVariable, Set.class); | 54 | Set<Long> assigneeUserIds = (Set<Long>) execution.getVariable(super.collectionVariable, Set.class); |
| 55 | if (assigneeUserIds == null) { | 55 | if (assigneeUserIds == null) { |
| 56 | assigneeUserIds = taskCandidateInvoker.calculateUsersByTask(execution); | 56 | assigneeUserIds = taskCandidateInvoker.calculateUsersByTask(execution); |
| 57 | - execution.setVariable(super.collectionVariable, assigneeUserIds); | ||
| 58 | if (CollUtil.isEmpty(assigneeUserIds)) { | 57 | if (CollUtil.isEmpty(assigneeUserIds)) { |
| 59 | // 特殊:如果没有处理人的情况下,至少有一个 null 空元素,避免自动通过! | 58 | // 特殊:如果没有处理人的情况下,至少有一个 null 空元素,避免自动通过! |
| 60 | // 这样,保证在 BpmUserTaskActivityBehavior 至少创建出一个 Task 任务 | 59 | // 这样,保证在 BpmUserTaskActivityBehavior 至少创建出一个 Task 任务 |
| 61 | // 用途:1)审批人为空时;2)审批类型为自动通过、自动拒绝时 | 60 | // 用途:1)审批人为空时;2)审批类型为自动通过、自动拒绝时 |
| 62 | assigneeUserIds = SetUtils.asSet((Long) null); | 61 | assigneeUserIds = SetUtils.asSet((Long) null); |
| 63 | } | 62 | } |
| 63 | + execution.setVariableLocal(super.collectionVariable, assigneeUserIds); | ||
| 64 | } | 64 | } |
| 65 | return assigneeUserIds.size(); | 65 | return assigneeUserIds.size(); |
| 66 | } | 66 | } |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java
| @@ -43,17 +43,18 @@ public class BpmSequentialMultiInstanceBehavior extends SequentialMultiInstanceB | @@ -43,17 +43,18 @@ public class BpmSequentialMultiInstanceBehavior extends SequentialMultiInstanceB | ||
| 43 | super.collectionElementVariable = FlowableUtils.formatExecutionCollectionElementVariable(execution.getCurrentActivityId()); | 43 | super.collectionElementVariable = FlowableUtils.formatExecutionCollectionElementVariable(execution.getCurrentActivityId()); |
| 44 | 44 | ||
| 45 | // 第二步,获取任务的所有处理人 | 45 | // 第二步,获取任务的所有处理人 |
| 46 | + // 不使用 execution.getVariable 原因:目前依次审批任务回退后 collectionVariable 变量没有清理, 如果重新进入该任务不会重新分配审批人 | ||
| 46 | @SuppressWarnings("unchecked") | 47 | @SuppressWarnings("unchecked") |
| 47 | - Set<Long> assigneeUserIds = (Set<Long>) execution.getVariable(super.collectionVariable, Set.class); | 48 | + Set<Long> assigneeUserIds = (Set<Long>) execution.getVariableLocal(super.collectionVariable, Set.class); |
| 48 | if (assigneeUserIds == null) { | 49 | if (assigneeUserIds == null) { |
| 49 | assigneeUserIds = taskCandidateInvoker.calculateUsersByTask(execution); | 50 | assigneeUserIds = taskCandidateInvoker.calculateUsersByTask(execution); |
| 50 | - execution.setVariable(super.collectionVariable, assigneeUserIds); | ||
| 51 | if (CollUtil.isEmpty(assigneeUserIds)) { | 51 | if (CollUtil.isEmpty(assigneeUserIds)) { |
| 52 | // 特殊:如果没有处理人的情况下,至少有一个 null 空元素,避免自动通过! | 52 | // 特殊:如果没有处理人的情况下,至少有一个 null 空元素,避免自动通过! |
| 53 | // 这样,保证在 BpmUserTaskActivityBehavior 至少创建出一个 Task 任务 | 53 | // 这样,保证在 BpmUserTaskActivityBehavior 至少创建出一个 Task 任务 |
| 54 | // 用途:1)审批人为空时;2)审批类型为自动通过、自动拒绝时 | 54 | // 用途:1)审批人为空时;2)审批类型为自动通过、自动拒绝时 |
| 55 | assigneeUserIds = SetUtils.asSet((Long) null); | 55 | assigneeUserIds = SetUtils.asSet((Long) null); |
| 56 | } | 56 | } |
| 57 | + execution.setVariableLocal(super.collectionVariable, assigneeUserIds); | ||
| 57 | } | 58 | } |
| 58 | return assigneeUserIds.size(); | 59 | return assigneeUserIds.size(); |
| 59 | } | 60 | } |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/form/BpmTaskCandidateFormSDeptLeaderStrategy.java renamed to yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/form/BpmTaskCandidateFormDeptLeaderStrategy.java
| @@ -18,7 +18,7 @@ import java.util.Set; | @@ -18,7 +18,7 @@ import java.util.Set; | ||
| 18 | * @author jason | 18 | * @author jason |
| 19 | */ | 19 | */ |
| 20 | @Component | 20 | @Component |
| 21 | -public class BpmTaskCandidateFormSDeptLeaderStrategy extends AbstractBpmTaskCandidateDeptLeaderStrategy { | 21 | +public class BpmTaskCandidateFormDeptLeaderStrategy extends AbstractBpmTaskCandidateDeptLeaderStrategy { |
| 22 | 22 | ||
| 23 | @Override | 23 | @Override |
| 24 | public BpmTaskCandidateStrategyEnum getStrategy() { | 24 | public BpmTaskCandidateStrategyEnum getStrategy() { |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateExpressionStrategy.java
| @@ -4,10 +4,14 @@ import cn.hutool.core.convert.Convert; | @@ -4,10 +4,14 @@ import cn.hutool.core.convert.Convert; | ||
| 4 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy; | 4 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy; |
| 5 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum; | 5 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum; |
| 6 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils; | 6 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils; |
| 7 | +import com.google.common.collect.Sets; | ||
| 8 | +import lombok.extern.slf4j.Slf4j; | ||
| 7 | import org.flowable.bpmn.model.BpmnModel; | 9 | import org.flowable.bpmn.model.BpmnModel; |
| 10 | +import org.flowable.common.engine.api.FlowableException; | ||
| 8 | import org.flowable.engine.delegate.DelegateExecution; | 11 | import org.flowable.engine.delegate.DelegateExecution; |
| 9 | import org.springframework.stereotype.Component; | 12 | import org.springframework.stereotype.Component; |
| 10 | 13 | ||
| 14 | +import java.util.HashMap; | ||
| 11 | import java.util.Map; | 15 | import java.util.Map; |
| 12 | import java.util.Set; | 16 | import java.util.Set; |
| 13 | 17 | ||
| @@ -17,6 +21,7 @@ import java.util.Set; | @@ -17,6 +21,7 @@ import java.util.Set; | ||
| 17 | * @author 芋道源码 | 21 | * @author 芋道源码 |
| 18 | */ | 22 | */ |
| 19 | @Component | 23 | @Component |
| 24 | +@Slf4j | ||
| 20 | public class BpmTaskCandidateExpressionStrategy implements BpmTaskCandidateStrategy { | 25 | public class BpmTaskCandidateExpressionStrategy implements BpmTaskCandidateStrategy { |
| 21 | 26 | ||
| 22 | @Override | 27 | @Override |
| @@ -38,8 +43,16 @@ public class BpmTaskCandidateExpressionStrategy implements BpmTaskCandidateStrat | @@ -38,8 +43,16 @@ public class BpmTaskCandidateExpressionStrategy implements BpmTaskCandidateStrat | ||
| 38 | @Override | 43 | @Override |
| 39 | public Set<Long> calculateUsersByActivity(BpmnModel bpmnModel, String activityId, String param, | 44 | public Set<Long> calculateUsersByActivity(BpmnModel bpmnModel, String activityId, String param, |
| 40 | Long startUserId, String processDefinitionId, Map<String, Object> processVariables) { | 45 | Long startUserId, String processDefinitionId, Map<String, Object> processVariables) { |
| 41 | - Object result = FlowableUtils.getExpressionValue(processVariables, param); | ||
| 42 | - return Convert.toSet(Long.class, result); | 46 | + Map<String, Object> variables = processVariables == null ? new HashMap<>() : processVariables; |
| 47 | + try { | ||
| 48 | + Object result = FlowableUtils.getExpressionValue(variables, param); | ||
| 49 | + return Convert.toSet(Long.class, result); | ||
| 50 | + } catch (FlowableException ex) { | ||
| 51 | + // 预测未运行的节点时候,表达式如果包含 execution 或者不存在的流程变量会抛异常, | ||
| 52 | + log.warn("[calculateUsersByActivity][表达式({}) 变量({}) 解析报错", param, variables, ex); | ||
| 53 | + // 不能预测候选人,返回空列表, 避免流程无法进行 | ||
| 54 | + return Sets.newHashSet(); | ||
| 55 | + } | ||
| 43 | } | 56 | } |
| 44 | 57 | ||
| 45 | } | 58 | } |
| 46 | \ No newline at end of file | 59 | \ No newline at end of file |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmnModelUtils.java
| @@ -73,7 +73,6 @@ public class BpmnModelUtils { | @@ -73,7 +73,6 @@ public class BpmnModelUtils { | ||
| 73 | extensionElement.setName(name); | 73 | extensionElement.setName(name); |
| 74 | attributes.forEach((key, value) -> { | 74 | attributes.forEach((key, value) -> { |
| 75 | ExtensionAttribute extensionAttribute = new ExtensionAttribute(key, value); | 75 | ExtensionAttribute extensionAttribute = new ExtensionAttribute(key, value); |
| 76 | - extensionAttribute.setNamespace(FLOWABLE_EXTENSIONS_NAMESPACE); | ||
| 77 | extensionElement.addAttribute(extensionAttribute); | 76 | extensionElement.addAttribute(extensionAttribute); |
| 78 | }); | 77 | }); |
| 79 | element.addExtensionElement(extensionElement); | 78 | element.addExtensionElement(extensionElement); |
| @@ -278,8 +277,8 @@ public class BpmnModelUtils { | @@ -278,8 +277,8 @@ public class BpmnModelUtils { | ||
| 278 | } | 277 | } |
| 279 | Map<String, String> fieldsPermission = MapUtil.newHashMap(); | 278 | Map<String, String> fieldsPermission = MapUtil.newHashMap(); |
| 280 | extensionElements.forEach(element -> { | 279 | extensionElements.forEach(element -> { |
| 281 | - String field = element.getAttributeValue(FLOWABLE_EXTENSIONS_NAMESPACE, FORM_FIELD_PERMISSION_ELEMENT_FIELD_ATTRIBUTE); | ||
| 282 | - String permission = element.getAttributeValue(FLOWABLE_EXTENSIONS_NAMESPACE, FORM_FIELD_PERMISSION_ELEMENT_PERMISSION_ATTRIBUTE); | 280 | + String field = element.getAttributeValue(null, FORM_FIELD_PERMISSION_ELEMENT_FIELD_ATTRIBUTE); |
| 281 | + String permission = element.getAttributeValue(null, FORM_FIELD_PERMISSION_ELEMENT_PERMISSION_ATTRIBUTE); | ||
| 283 | if (StrUtil.isNotEmpty(field) && StrUtil.isNotEmpty(permission)) { | 282 | if (StrUtil.isNotEmpty(field) && StrUtil.isNotEmpty(permission)) { |
| 284 | fieldsPermission.put(field, permission); | 283 | fieldsPermission.put(field, permission); |
| 285 | } | 284 | } |
| @@ -321,9 +320,9 @@ public class BpmnModelUtils { | @@ -321,9 +320,9 @@ public class BpmnModelUtils { | ||
| 321 | } | 320 | } |
| 322 | Map<Integer, BpmTaskRespVO.OperationButtonSetting> buttonSettings = Maps.newHashMapWithExpectedSize(extensionElements.size()); | 321 | Map<Integer, BpmTaskRespVO.OperationButtonSetting> buttonSettings = Maps.newHashMapWithExpectedSize(extensionElements.size()); |
| 323 | extensionElements.forEach(element -> { | 322 | extensionElements.forEach(element -> { |
| 324 | - String id = element.getAttributeValue(FLOWABLE_EXTENSIONS_NAMESPACE, BUTTON_SETTING_ELEMENT_ID_ATTRIBUTE); | ||
| 325 | - String displayName = element.getAttributeValue(FLOWABLE_EXTENSIONS_NAMESPACE, BUTTON_SETTING_ELEMENT_DISPLAY_NAME_ATTRIBUTE); | ||
| 326 | - String enable = element.getAttributeValue(FLOWABLE_EXTENSIONS_NAMESPACE, BUTTON_SETTING_ELEMENT_ENABLE_ATTRIBUTE); | 323 | + String id = element.getAttributeValue(null, BUTTON_SETTING_ELEMENT_ID_ATTRIBUTE); |
| 324 | + String displayName = element.getAttributeValue(null, BUTTON_SETTING_ELEMENT_DISPLAY_NAME_ATTRIBUTE); | ||
| 325 | + String enable = element.getAttributeValue(null, BUTTON_SETTING_ELEMENT_ENABLE_ATTRIBUTE); | ||
| 327 | if (StrUtil.isNotEmpty(id)) { | 326 | if (StrUtil.isNotEmpty(id)) { |
| 328 | BpmTaskRespVO.OperationButtonSetting setting = new BpmTaskRespVO.OperationButtonSetting(); | 327 | BpmTaskRespVO.OperationButtonSetting setting = new BpmTaskRespVO.OperationButtonSetting(); |
| 329 | buttonSettings.put(Integer.valueOf(id), setting.setDisplayName(displayName).setEnable(Boolean.parseBoolean(enable))); | 328 | buttonSettings.put(Integer.valueOf(id), setting.setDisplayName(displayName).setEnable(Boolean.parseBoolean(enable))); |
| @@ -720,7 +719,7 @@ public class BpmnModelUtils { | @@ -720,7 +719,7 @@ public class BpmnModelUtils { | ||
| 720 | && evalConditionExpress(variables, flow.getConditionExpression())); | 719 | && evalConditionExpress(variables, flow.getConditionExpression())); |
| 721 | if (matchSequenceFlow == null) { | 720 | if (matchSequenceFlow == null) { |
| 722 | matchSequenceFlow = CollUtil.findOne(gateway.getOutgoingFlows(), | 721 | matchSequenceFlow = CollUtil.findOne(gateway.getOutgoingFlows(), |
| 723 | - flow -> ObjUtil.notEqual(gateway.getDefaultFlow(), flow.getId())); | 722 | + flow -> ObjUtil.equal(gateway.getDefaultFlow(), flow.getId())); |
| 724 | // 特殊:没有默认的情况下,并且只有 1 个条件,则认为它是默认的 | 723 | // 特殊:没有默认的情况下,并且只有 1 个条件,则认为它是默认的 |
| 725 | if (matchSequenceFlow == null && gateway.getOutgoingFlows().size() == 1) { | 724 | if (matchSequenceFlow == null && gateway.getOutgoingFlows().size() == 1) { |
| 726 | matchSequenceFlow = gateway.getOutgoingFlows().get(0); | 725 | matchSequenceFlow = gateway.getOutgoingFlows().get(0); |
| @@ -742,7 +741,7 @@ public class BpmnModelUtils { | @@ -742,7 +741,7 @@ public class BpmnModelUtils { | ||
| 742 | && evalConditionExpress(variables, flow.getConditionExpression())); | 741 | && evalConditionExpress(variables, flow.getConditionExpression())); |
| 743 | if (CollUtil.isEmpty(matchSequenceFlows)) { | 742 | if (CollUtil.isEmpty(matchSequenceFlows)) { |
| 744 | matchSequenceFlows = CollUtil.filterNew(gateway.getOutgoingFlows(), | 743 | matchSequenceFlows = CollUtil.filterNew(gateway.getOutgoingFlows(), |
| 745 | - flow -> ObjUtil.notEqual(gateway.getDefaultFlow(), flow.getId())); | 744 | + flow -> ObjUtil.equal(gateway.getDefaultFlow(), flow.getId())); |
| 746 | // 特殊:没有默认的情况下,并且只有 1 个条件,则认为它是默认的 | 745 | // 特殊:没有默认的情况下,并且只有 1 个条件,则认为它是默认的 |
| 747 | if (CollUtil.isEmpty(matchSequenceFlows) && gateway.getOutgoingFlows().size() == 1) { | 746 | if (CollUtil.isEmpty(matchSequenceFlows) && gateway.getOutgoingFlows().size() == 1) { |
| 748 | matchSequenceFlows = gateway.getOutgoingFlows(); | 747 | matchSequenceFlows = gateway.getOutgoingFlows(); |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
| @@ -83,7 +83,7 @@ public class SimpleModelUtils { | @@ -83,7 +83,7 @@ public class SimpleModelUtils { | ||
| 83 | 83 | ||
| 84 | private static BpmSimpleModelNodeVO buildStartNode() { | 84 | private static BpmSimpleModelNodeVO buildStartNode() { |
| 85 | return new BpmSimpleModelNodeVO().setId(START_EVENT_NODE_ID) | 85 | return new BpmSimpleModelNodeVO().setId(START_EVENT_NODE_ID) |
| 86 | - .setName(BpmSimpleModelNodeType.START_USER_NODE.getName()) | 86 | + .setName(BpmSimpleModelNodeType.START_NODE.getName()) |
| 87 | .setType(BpmSimpleModelNodeType.START_NODE.getType()); | 87 | .setType(BpmSimpleModelNodeType.START_NODE.getType()); |
| 88 | } | 88 | } |
| 89 | 89 |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
| @@ -65,7 +65,7 @@ public class BpmModelServiceImpl implements BpmModelService { | @@ -65,7 +65,7 @@ public class BpmModelServiceImpl implements BpmModelService { | ||
| 65 | public List<Model> getModelList(String name) { | 65 | public List<Model> getModelList(String name) { |
| 66 | ModelQuery modelQuery = repositoryService.createModelQuery(); | 66 | ModelQuery modelQuery = repositoryService.createModelQuery(); |
| 67 | if (StrUtil.isNotEmpty(name)) { | 67 | if (StrUtil.isNotEmpty(name)) { |
| 68 | - modelQuery.modelNameLike(name); | 68 | + modelQuery.modelNameLike("%" + name + "%"); |
| 69 | } | 69 | } |
| 70 | return modelQuery.list(); | 70 | return modelQuery.list(); |
| 71 | } | 71 | } |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
| 1 | -package cn.iocoder.yudao.module.bpm.service.task; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.date.DateUtils; import cn.iocoder.yudao.framework.common.util.json.JsonUtils; import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; import cn.iocoder.yudao.framework.common.util.object.PageUtils; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO.ActivityNodeTask; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO; import cn.iocoder.yudao.module.bpm.convert.task.BpmProcessInstanceConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO; import cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants; import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelTypeEnum; import cn.iocoder.yudao.module.bpm.enums.definition.BpmSimpleModelNodeType; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum; import cn.iocoder.yudao.module.bpm.enums.task.BpmReasonEnum; import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum; import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateInvoker; import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.dept.BpmTaskCandidateStartUserSelectStrategy; import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants; import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnVariableConstants; import cn.iocoder.yudao.module.bpm.framework.flowable.core.event.BpmProcessInstanceEventPublisher; import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils; import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils; import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.SimpleModelUtils; import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService; import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService; import cn.iocoder.yudao.module.system.api.dept.DeptApi; import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import jakarta.annotation.Resource; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.constants.BpmnXMLConstants; import org.flowable.bpmn.model.*; import org.flowable.engine.HistoryService; import org.flowable.engine.RuntimeService; import org.flowable.engine.history.HistoricActivityInstance; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.history.HistoricProcessInstanceQuery; import org.flowable.engine.repository.ProcessDefinition; import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.history.HistoricTaskInstance; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import java.util.*; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; import static cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO.ActivityNode; import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*; import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants.START_USER_NODE_ID; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.flowable.bpmn.constants.BpmnXMLConstants.*; /** * 流程实例 Service 实现类 * <p> * ProcessDefinition & ProcessInstance & Execution & Task 的关系: * 1. <a href="https://blog.csdn.net/bobozai86/article/details/105210414" /> * <p> * HistoricProcessInstance & ProcessInstance 的关系: * 1. <a href=" https://my.oschina.net/843294669/blog/71902" /> * <p> * 简单来说,前者 = 历史 + 运行中的流程实例,后者仅是运行中的流程实例 * * @author 芋道源码 */ @Service @Validated @Slf4j public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService { @Resource private RuntimeService runtimeService; @Resource private HistoryService historyService; @Resource private BpmProcessDefinitionService processDefinitionService; @Resource @Lazy // 避免循环依赖 private BpmTaskService taskService; @Resource private BpmMessageService messageService; @Resource private AdminUserApi adminUserApi; @Resource private DeptApi deptApi; @Resource private BpmProcessInstanceEventPublisher processInstanceEventPublisher; @Resource private BpmTaskCandidateInvoker taskCandidateInvoker; // ========== Query 查询相关方法 ========== @Override public ProcessInstance getProcessInstance(String id) { return runtimeService.createProcessInstanceQuery() .includeProcessVariables() .processInstanceId(id) .singleResult(); } @Override public List<ProcessInstance> getProcessInstances(Set<String> ids) { return runtimeService.createProcessInstanceQuery().processInstanceIds(ids).list(); } @Override public HistoricProcessInstance getHistoricProcessInstance(String id) { return historyService.createHistoricProcessInstanceQuery().processInstanceId(id).includeProcessVariables().singleResult(); } @Override public List<HistoricProcessInstance> getHistoricProcessInstances(Set<String> ids) { return historyService.createHistoricProcessInstanceQuery().processInstanceIds(ids).list(); } @Override public PageResult<HistoricProcessInstance> getProcessInstancePage(Long userId, BpmProcessInstancePageReqVO pageReqVO) { // 通过 BpmProcessInstanceExtDO 表,先查询到对应的分页 HistoricProcessInstanceQuery processInstanceQuery = historyService.createHistoricProcessInstanceQuery() .includeProcessVariables() .processInstanceTenantId(FlowableUtils.getTenantId()) .orderByProcessInstanceStartTime().desc(); if (userId != null) { // 【我的流程】菜单时,需要传递该字段 processInstanceQuery.startedBy(String.valueOf(userId)); } else if (pageReqVO.getStartUserId() != null) { // 【管理流程】菜单时,才会传递该字段 processInstanceQuery.startedBy(String.valueOf(pageReqVO.getStartUserId())); } if (StrUtil.isNotEmpty(pageReqVO.getName())) { processInstanceQuery.processInstanceNameLike("%" + pageReqVO.getName() + "%"); } if (StrUtil.isNotEmpty(pageReqVO.getProcessDefinitionKey())) { processInstanceQuery.processDefinitionKey(pageReqVO.getProcessDefinitionKey()); } if (StrUtil.isNotEmpty(pageReqVO.getCategory())) { processInstanceQuery.processDefinitionCategory(pageReqVO.getCategory()); } if (pageReqVO.getStatus() != null) { processInstanceQuery.variableValueEquals(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, pageReqVO.getStatus()); } if (ArrayUtil.isNotEmpty(pageReqVO.getCreateTime())) { processInstanceQuery.startedAfter(DateUtils.of(pageReqVO.getCreateTime()[0])); processInstanceQuery.startedBefore(DateUtils.of(pageReqVO.getCreateTime()[1])); } // 查询数量 long processInstanceCount = processInstanceQuery.count(); if (processInstanceCount == 0) { return PageResult.empty(processInstanceCount); } // 查询列表 List<HistoricProcessInstance> processInstanceList = processInstanceQuery.listPage(PageUtils.getStart(pageReqVO), pageReqVO.getPageSize()); return new PageResult<>(processInstanceList, processInstanceCount); } private Map<String, String> getFormFieldsPermission(BpmnModel bpmnModel, String activityId, String taskId) { // 1. 获取流程活动编号。流程活动 Id 为空事,从流程任务中获取流程活动 Id if (StrUtil.isEmpty(activityId) && StrUtil.isNotEmpty(taskId)) { activityId = Optional.ofNullable(taskService.getHistoricTask(taskId)) .map(HistoricTaskInstance::getTaskDefinitionKey).orElse(null); } if (StrUtil.isEmpty(activityId)) { return null; } // 2. 从 BpmnModel 中解析表单字段权限 return BpmnModelUtils.parseFormFieldsPermission(bpmnModel, activityId); } @Override public BpmApprovalDetailRespVO getApprovalDetail(Long loginUserId, BpmApprovalDetailReqVO reqVO) { // 1.1 从 reqVO 中,读取公共变量 Long startUserId = loginUserId; // 流程发起人 HistoricProcessInstance historicProcessInstance = null; // 流程实例 Integer processInstanceStatus = BpmProcessInstanceStatusEnum.NOT_START.getStatus(); // 流程状态 Map<String, Object> processVariables = reqVO.getProcessVariables(); // 流程变量 // 1.2 如果是流程已发起的场景,则使用流程实例的数据 if (reqVO.getProcessInstanceId() != null) { historicProcessInstance = getHistoricProcessInstance(reqVO.getProcessInstanceId()); if (historicProcessInstance == null) { throw exception(ErrorCodeConstants.PROCESS_INSTANCE_NOT_EXISTS); } startUserId = Long.valueOf(historicProcessInstance.getStartUserId()); processInstanceStatus = FlowableUtils.getProcessInstanceStatus(historicProcessInstance); processVariables = historicProcessInstance.getProcessVariables(); } // 1.3 读取其它相关数据 ProcessDefinition processDefinition = processDefinitionService.getProcessDefinition( historicProcessInstance != null ? historicProcessInstance.getProcessDefinitionId() : reqVO.getProcessDefinitionId()); BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(processDefinition.getId()); BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(processDefinition.getId()); // 2.1 已结束 + 进行中的活动节点 List<ActivityNode> endActivityNodes = null; // 已结束的审批信息 List<ActivityNode> runActivityNodes = null; // 进行中的审批信息 List<HistoricActivityInstance> activities = null; // 流程实例列表 if (reqVO.getProcessInstanceId() != null) { activities = taskService.getActivityListByProcessInstanceId(reqVO.getProcessInstanceId()); List<HistoricTaskInstance> tasks = taskService.getTaskListByProcessInstanceId(reqVO.getProcessInstanceId(), true); endActivityNodes = getEndActivityNodeList(startUserId, bpmnModel, processDefinitionInfo, historicProcessInstance, processInstanceStatus, activities, tasks); runActivityNodes = getRunApproveNodeList(startUserId, bpmnModel, processDefinition, processVariables, activities, tasks); } // 2.2 流程已经结束,直接 return,无需预测 if (BpmProcessInstanceStatusEnum.isProcessEndStatus(processInstanceStatus)) { return buildApprovalDetail(reqVO, bpmnModel, processDefinition, processDefinitionInfo, historicProcessInstance, processInstanceStatus, endActivityNodes, runActivityNodes, null, null); } // 3.1 计算当前登录用户的待办任务 // TODO @jason:有一个极端情况,如果一个用户有 2 个 task A 和 B,A 已经通过,B 需要审核。这个时,通过 A 进来,todo 拿到 B,会不会表单权限不一致哈。 BpmTaskRespVO todoTask = taskService.getFirstTodoTask(loginUserId, reqVO.getProcessInstanceId()); // 3.2 预测未运行节点的审批信息 List<ActivityNode> simulateActivityNodes = getSimulateApproveNodeList(startUserId, bpmnModel, processDefinitionInfo, processVariables, activities); // 4. 拼接最终数据 return buildApprovalDetail(reqVO, bpmnModel, processDefinition, processDefinitionInfo, historicProcessInstance, processInstanceStatus, endActivityNodes, runActivityNodes, simulateActivityNodes, todoTask); } /** * 拼接审批详情的最终数据 * <p> * 主要是,拼接审批人的用户信息、部门信息 */ private BpmApprovalDetailRespVO buildApprovalDetail(BpmApprovalDetailReqVO reqVO, BpmnModel bpmnModel, ProcessDefinition processDefinition, BpmProcessDefinitionInfoDO processDefinitionInfo, HistoricProcessInstance processInstance, Integer processInstanceStatus, List<ActivityNode> endApprovalNodeInfos, List<ActivityNode> runningApprovalNodeInfos, List<ActivityNode> simulateApprovalNodeInfos, BpmTaskRespVO todoTask) { // 1. 获取所有需要读取用户信息的 userIds List<ActivityNode> approveNodes = newArrayList(asList(endApprovalNodeInfos, runningApprovalNodeInfos, simulateApprovalNodeInfos)); Set<Long> userIds = BpmProcessInstanceConvert.INSTANCE.parseUserIds(processInstance, approveNodes, todoTask); Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds); Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId)); // 2. 表单权限 Map<String, String> formFieldsPermission = getFormFieldsPermission(bpmnModel, reqVO.getActivityId(), reqVO.getTaskId()); // 3. 拼接数据 return BpmProcessInstanceConvert.INSTANCE.buildApprovalDetail(bpmnModel, processDefinition, processDefinitionInfo, processInstance, processInstanceStatus, approveNodes, todoTask, formFieldsPermission, userMap, deptMap); } /** * 获得【已结束】的活动节点们 */ private List<ActivityNode> getEndActivityNodeList(Long startUserId, BpmnModel bpmnModel, BpmProcessDefinitionInfoDO processDefinitionInfo, HistoricProcessInstance historicProcessInstance, Integer processInstanceStatus, List<HistoricActivityInstance> activities, List<HistoricTaskInstance> tasks) { // 遍历 tasks 列表,只处理已结束的 UserTask // 为什么不通过 activities 呢?因为,加签场景下,它只存在于 tasks,没有 activities,导致如果遍历 activities 的话,它无法成为一个节点 List<HistoricTaskInstance> endTasks = filterList(tasks, task -> task.getEndTime() != null); List<ActivityNode> approvalNodes = convertList(endTasks, task -> { FlowElement flowNode = BpmnModelUtils.getFlowElementById(bpmnModel, task.getTaskDefinitionKey()); ActivityNode activityNode = new ActivityNode().setId(task.getTaskDefinitionKey()).setName(task.getName()) .setNodeType(START_USER_NODE_ID.equals(task.getTaskDefinitionKey()) ? BpmSimpleModelNodeType.START_USER_NODE.getType() : BpmSimpleModelNodeType.APPROVE_NODE.getType()) .setStatus(FlowableUtils.getTaskStatus(task)) .setCandidateStrategy(BpmnModelUtils.parseCandidateStrategy(flowNode)) .setStartTime(DateUtils.of(task.getCreateTime())).setEndTime(DateUtils.of(task.getEndTime())) .setTasks(singletonList(BpmProcessInstanceConvert.INSTANCE.buildApprovalTaskInfo(task))); // 如果是取消状态,则跳过 if (BpmTaskStatusEnum.isCancelStatus(activityNode.getStatus())) { return null; } return activityNode; }); // 遍历 activities,只处理已结束的 StartEvent、EndEvent List<HistoricActivityInstance> endActivities = filterList(activities, activity -> activity.getEndTime() != null && (StrUtil.equalsAny(activity.getActivityType(), ELEMENT_EVENT_START, ELEMENT_EVENT_END))); endActivities.forEach(activity -> { // StartEvent:只处理 BPMN 的场景。因为,SIMPLE 情况下,已经有 START_USER_NODE 节点 if (ELEMENT_EVENT_START.equals(activity.getActivityType()) && BpmModelTypeEnum.BPMN.getType().equals(processDefinitionInfo.getModelType())) { ActivityNodeTask startTask = new ActivityNodeTask().setId(BpmnModelConstants.START_USER_NODE_ID) .setAssignee(startUserId).setStatus(BpmTaskStatusEnum.APPROVE.getStatus()); ActivityNode startNode = new ActivityNode().setId(startTask.getId()) .setName(BpmSimpleModelNodeType.START_USER_NODE.getName()) .setNodeType(BpmSimpleModelNodeType.START_USER_NODE.getType()) .setStatus(startTask.getStatus()).setTasks(ListUtil.of(startTask)) .setStartTime(DateUtils.of(activity.getStartTime())).setEndTime(DateUtils.of(activity.getEndTime())); approvalNodes.add(0, startNode); return; } // EndEvent if (ELEMENT_EVENT_END.equals(activity.getActivityType())) { if (BpmProcessInstanceStatusEnum.isRejectStatus(processInstanceStatus)) { // 拒绝情况下,不需要展示 EndEvent 结束节点。原因是:前端已经展示 x 效果,无需重复展示 return; } ActivityNode endNode = new ActivityNode().setId(activity.getId()) .setName(BpmSimpleModelNodeType.END_NODE.getName()) .setNodeType(BpmSimpleModelNodeType.END_NODE.getType()).setStatus(processInstanceStatus) .setStartTime(DateUtils.of(activity.getStartTime())).setEndTime(DateUtils.of(activity.getEndTime())); String reason = FlowableUtils.getProcessInstanceReason(historicProcessInstance); if (StrUtil.isNotEmpty(reason)) { endNode.setTasks(singletonList(new ActivityNodeTask().setId(endNode.getId()) .setStatus(endNode.getStatus()).setReason(reason))); } approvalNodes.add(endNode); } }); return approvalNodes; } /** * 获得【进行中】的活动节点们 */ private List<ActivityNode> getRunApproveNodeList(Long startUserId, BpmnModel bpmnModel, ProcessDefinition processDefinition, Map<String, Object> processVariables, List<HistoricActivityInstance> activities, List<HistoricTaskInstance> tasks) { // 构建运行中的任务,基于 activityId 分组 List<HistoricActivityInstance> runActivities = filterList(activities, activity -> activity.getEndTime() == null && (StrUtil.equalsAny(activity.getActivityType(), ELEMENT_TASK_USER))); Map<String, List<HistoricActivityInstance>> runningTaskMap = convertMultiMap(runActivities, HistoricActivityInstance::getActivityId); // 按照 activityId 分组,构建 ApprovalNodeInfo 节点 Map<String, HistoricTaskInstance> taskMap = convertMap(tasks, HistoricTaskInstance::getId); return convertList(runningTaskMap.entrySet(), entry -> { String activityId = entry.getKey(); List<HistoricActivityInstance> taskActivities = entry.getValue(); // 构建活动节点 FlowElement flowNode = BpmnModelUtils.getFlowElementById(bpmnModel, activityId); HistoricActivityInstance firstActivity = CollUtil.getFirst(taskActivities); // 取第一个任务,会签/或签的任务,开始时间相同 ActivityNode activityNode = new ActivityNode().setId(firstActivity.getActivityId()).setName(firstActivity.getActivityName()) .setNodeType(BpmSimpleModelNodeType.APPROVE_NODE.getType()).setStatus(BpmTaskStatusEnum.RUNNING.getStatus()) .setCandidateStrategy(BpmnModelUtils.parseCandidateStrategy(flowNode)) .setStartTime(DateUtils.of(CollUtil.getFirst(taskActivities).getStartTime())) .setTasks(new ArrayList<>()); // 处理每个任务的 tasks 属性 for (HistoricActivityInstance activity : taskActivities) { HistoricTaskInstance task = taskMap.get(activity.getTaskId()); activityNode.getTasks().add(BpmProcessInstanceConvert.INSTANCE.buildApprovalTaskInfo(task)); // 加签子任务,需要过滤掉已经完成的加签子任务 List<HistoricTaskInstance> childrenTasks = filterList( taskService.getAllChildrenTaskListByParentTaskId(activity.getTaskId(), tasks), childTask -> childTask.getEndTime() == null); if (CollUtil.isNotEmpty(childrenTasks)) { activityNode.getTasks().addAll(convertList(childrenTasks, BpmProcessInstanceConvert.INSTANCE::buildApprovalTaskInfo)); } } // 处理每个任务的 candidateUsers 属性:如果是依次审批,需要预测它的后续审批人。因为 Task 是审批完一个,创建一个新的 Task if (BpmnModelUtils.isSequentialUserTask(flowNode)) { List<Long> candidateUserIds = getTaskCandidateUserList(bpmnModel, flowNode.getId(), startUserId, processDefinition.getId(), processVariables); // 截取当前审批人位置后面的候选人,不包含当前审批人 ActivityNodeTask approvalTaskInfo = CollUtil.getFirst(activityNode.getTasks()); Assert.notNull(approvalTaskInfo, "任务不能为空"); int index = CollUtil.indexOf(candidateUserIds, userId -> ObjectUtils.equalsAny(userId, approvalTaskInfo.getOwner(), approvalTaskInfo.getAssignee())); // 委派或者向前加签情况,需要先比较 owner activityNode.setCandidateUserIds(CollUtil.sub(candidateUserIds, index + 1, candidateUserIds.size())); } return activityNode; }); } /** * 获得【预测(未来)】的活动节点们 */ private List<ActivityNode> getSimulateApproveNodeList(Long startUserId, BpmnModel bpmnModel, BpmProcessDefinitionInfoDO processDefinitionInfo, Map<String, Object> processVariables, List<HistoricActivityInstance> activities) { // TODO @芋艿:【可优化】在驳回场景下,未来的预测准确性不高。原因是,驳回后,HistoricActivityInstance 包括了历史的操作,不是只有 startEvent 到当前节点的记录 Set<String> runActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId); // 情况一:BPMN 设计器 if (Objects.equals(BpmModelTypeEnum.BPMN.getType(), processDefinitionInfo.getModelType())) { List<FlowElement> flowElements = BpmnModelUtils.simulateProcess(bpmnModel, processVariables); return convertList(flowElements, flowElement -> buildNotRunApproveNodeForBpmn(startUserId, bpmnModel, processDefinitionInfo, processVariables, flowElement, runActivityIds)); } // 情况二:SIMPLE 设计器 if (Objects.equals(BpmModelTypeEnum.SIMPLE.getType(), processDefinitionInfo.getModelType())) { BpmSimpleModelNodeVO simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class); List<BpmSimpleModelNodeVO> simpleNodes = SimpleModelUtils.simulateProcess(simpleModel, processVariables); return convertList(simpleNodes, simpleNode -> buildNotRunApproveNodeForSimple(startUserId, bpmnModel, processDefinitionInfo, processVariables, simpleNode, runActivityIds)); } throw new IllegalArgumentException("未知设计器类型:" + processDefinitionInfo.getModelType()); } private ActivityNode buildNotRunApproveNodeForSimple(Long startUserId, BpmnModel bpmnModel, BpmProcessDefinitionInfoDO processDefinitionInfo, Map<String, Object> processVariables, BpmSimpleModelNodeVO node, Set<String> runActivityIds) { // TODO @芋艿:【可优化】在驳回场景下,未来的预测准确性不高。原因是,驳回后,HistoricActivityInstance 包括了历史的操作,不是只有 startEvent 到当前节点的记录 if (runActivityIds.contains(node.getId())) { return null; } ActivityNode activityNode = new ActivityNode().setId(node.getId()).setName(node.getName()) .setNodeType(node.getType()).setCandidateStrategy(node.getCandidateStrategy()) .setStatus(BpmTaskStatusEnum.NOT_START.getStatus()); // 1. 开始节点/审批节点 if (ObjectUtils.equalsAny(node.getType(), BpmSimpleModelNodeType.START_USER_NODE.getType(), BpmSimpleModelNodeType.APPROVE_NODE.getType())) { List<Long> candidateUserIds = getTaskCandidateUserList(bpmnModel, node.getId(), startUserId, processDefinitionInfo.getProcessDefinitionId(), processVariables); activityNode.setCandidateUserIds(candidateUserIds); return activityNode; } // 2. 结束节点 if (BpmSimpleModelNodeType.END_NODE.getType().equals(node.getType())) { return activityNode; } // 3. 抄送节点 if (CollUtil.isEmpty(runActivityIds) && // 流程发起时:需要展示抄送节点,用于选择抄送人 BpmSimpleModelNodeType.COPY_NODE.getType().equals(node.getType())) { return activityNode; } return null; } private ActivityNode buildNotRunApproveNodeForBpmn(Long startUserId, BpmnModel bpmnModel, BpmProcessDefinitionInfoDO processDefinitionInfo, Map<String, Object> processVariables, FlowElement node, Set<String> runActivityIds) { if (runActivityIds.contains(node.getId())) { return null; } ActivityNode activityNode = new ActivityNode().setId(node.getId()).setStatus(BpmTaskStatusEnum.NOT_START.getStatus()); // 1. 开始节点 if (node instanceof StartEvent) { return activityNode.setName(BpmSimpleModelNodeType.START_USER_NODE.getName()) .setNodeType(BpmSimpleModelNodeType.START_USER_NODE.getType()); } // 2. 审批节点 if (node instanceof UserTask) { List<Long> candidateUserIds = getTaskCandidateUserList(bpmnModel, node.getId(), startUserId, processDefinitionInfo.getProcessDefinitionId(), processVariables); return activityNode.setName(node.getName()).setNodeType(BpmSimpleModelNodeType.APPROVE_NODE.getType()) .setCandidateStrategy(BpmnModelUtils.parseCandidateStrategy(node)) .setCandidateUserIds(candidateUserIds); } // 3. 结束节点 if (node instanceof EndEvent) { return activityNode.setName(BpmSimpleModelNodeType.END_NODE.getName()) .setNodeType(BpmSimpleModelNodeType.END_NODE.getType()); } return null; } private List<Long> getTaskCandidateUserList(BpmnModel bpmnModel, String activityId, Long startUserId, String processDefinitionId, Map<String, Object> processVariables) { Set<Long> userIds = taskCandidateInvoker.calculateUsersByActivity(bpmnModel, activityId, startUserId, processDefinitionId, processVariables); return new ArrayList<>(userIds); } @Override public BpmProcessInstanceBpmnModelViewRespVO getProcessInstanceBpmnModelView(String id) { // 1.1 获得流程实例 HistoricProcessInstance processInstance = getHistoricProcessInstance(id); if (processInstance == null) { return null; } // 1.2 获得流程定义 BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(processInstance.getProcessDefinitionId()); if (bpmnModel == null) { return null; } BpmSimpleModelNodeVO simpleModel = null; BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo( processInstance.getProcessDefinitionId()); if (processDefinitionInfo != null && BpmModelTypeEnum.SIMPLE.getType().equals(processDefinitionInfo.getModelType())) { simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class); } // 1.3 获得流程实例对应的活动实例列表 + 任务列表 List<HistoricActivityInstance> activities = taskService.getActivityListByProcessInstanceId(id); List<HistoricTaskInstance> tasks = taskService.getTaskListByProcessInstanceId(id, true); // 2.1 拼接进度信息 Set<String> unfinishedTaskActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId, activityInstance -> activityInstance.getEndTime() == null); Set<String> finishedTaskActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId, activityInstance -> activityInstance.getEndTime() != null && ObjectUtil.notEqual(activityInstance.getActivityType(), BpmnXMLConstants.ELEMENT_SEQUENCE_FLOW)); Set<String> finishedSequenceFlowActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId, activityInstance -> activityInstance.getEndTime() != null && ObjectUtil.equals(activityInstance.getActivityType(), BpmnXMLConstants.ELEMENT_SEQUENCE_FLOW)); // 特殊:会签情况下,会有部分已完成(审批)、部分未完成(待审批),此时需要 finishedTaskActivityIds 移除掉 unfinishedTaskActivityIds.removeAll(finishedTaskActivityIds); // 特殊:如果流程实例被拒绝,则需要计算是哪个活动节点。 // 注意,只取最后一个。因为会存在多次拒绝的情况,拒绝驳回到指定节点 Set<String> rejectTaskActivityIds = CollUtil.newHashSet(); if (BpmProcessInstanceStatusEnum.isRejectStatus(FlowableUtils.getProcessInstanceStatus(processInstance))) { tasks.stream() .filter(task -> BpmTaskStatusEnum.isRejectStatus(FlowableUtils.getTaskStatus(task))) .max(Comparator.comparing(HistoricTaskInstance::getEndTime)) .ifPresent(reject -> rejectTaskActivityIds.add(reject.getTaskDefinitionKey())); finishedTaskActivityIds.removeAll(rejectTaskActivityIds); } // 2.2 拼接基础信息 Set<Long> userIds = BpmProcessInstanceConvert.INSTANCE.parseUserIds02(processInstance, tasks); Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds); Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId)); return BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceBpmnModelView(processInstance, tasks, bpmnModel, simpleModel, unfinishedTaskActivityIds, finishedTaskActivityIds, finishedSequenceFlowActivityIds, rejectTaskActivityIds, userMap, deptMap); } // ========== Update 写入相关方法 ========== @Override @Transactional(rollbackFor = Exception.class) public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqVO createReqVO) { // 获得流程定义 ProcessDefinition definition = processDefinitionService.getProcessDefinition(createReqVO.getProcessDefinitionId()); // 发起流程 return createProcessInstance0(userId, definition, createReqVO.getVariables(), null, createReqVO.getStartUserSelectAssignees()); } @Override public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO createReqDTO) { // 获得流程定义 ProcessDefinition definition = processDefinitionService.getActiveProcessDefinition(createReqDTO.getProcessDefinitionKey()); // 发起流程 return createProcessInstance0(userId, definition, createReqDTO.getVariables(), createReqDTO.getBusinessKey(), createReqDTO.getStartUserSelectAssignees()); } private String createProcessInstance0(Long userId, ProcessDefinition definition, Map<String, Object> variables, String businessKey, Map<String, List<Long>> startUserSelectAssignees) { // 1.1 校验流程定义 if (definition == null) { throw exception(PROCESS_DEFINITION_NOT_EXISTS); } if (definition.isSuspended()) { throw exception(PROCESS_DEFINITION_IS_SUSPENDED); } BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(definition.getId()); if (processDefinitionInfo == null) { throw exception(PROCESS_DEFINITION_NOT_EXISTS); } // 1.2 校验是否能够发起 if (!processDefinitionService.canUserStartProcessDefinition(processDefinitionInfo, userId)) { throw exception(PROCESS_INSTANCE_START_USER_CAN_START); } // 1.3 校验发起人自选审批人 validateStartUserSelectAssignees(definition, startUserSelectAssignees); // 2. 创建流程实例 if (variables == null) { variables = new HashMap<>(); } FlowableUtils.filterProcessInstanceFormVariable(variables); // 过滤一下,避免 ProcessInstance 系统级的变量被占用 variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_ID, userId); // 设置流程变量,发起人 ID variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, // 流程实例状态:审批中 BpmProcessInstanceStatusEnum.RUNNING.getStatus()); if (CollUtil.isNotEmpty(startUserSelectAssignees)) { variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES, startUserSelectAssignees); } ProcessInstance instance = runtimeService.createProcessInstanceBuilder() .processDefinitionId(definition.getId()) .businessKey(businessKey) .name(definition.getName().trim()) .variables(variables) .start(); return instance.getId(); } private void validateStartUserSelectAssignees(ProcessDefinition definition, Map<String, List<Long>> startUserSelectAssignees) { // 1. 获得发起人自选审批人的 UserTask/ServiceTask 列表 BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(definition.getId()); List<Task> tasks = BpmTaskCandidateStartUserSelectStrategy.getStartUserSelectTaskList(bpmnModel); if (CollUtil.isEmpty(tasks)) { return; } // 2. 校验发起人自选审批人的审批人和抄送人是否都配置了 tasks.forEach(task -> { List<Long> assignees = startUserSelectAssignees != null ? startUserSelectAssignees.get(task.getId()) : null; if (CollUtil.isEmpty(assignees)) { throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_CONFIG, task.getName()); } Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(assignees); assignees.forEach(assignee -> { if (userMap.get(assignee) == null) { throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_EXISTS, task.getName(), assignee); } }); }); } @Override public void cancelProcessInstanceByStartUser(Long userId, @Valid BpmProcessInstanceCancelReqVO cancelReqVO) { // 1.1 校验流程实例存在 ProcessInstance instance = getProcessInstance(cancelReqVO.getId()); if (instance == null) { throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS); } // 1.2 只能取消自己的 if (!Objects.equals(instance.getStartUserId(), String.valueOf(userId))) { throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF); } // 2. 取消流程 updateProcessInstanceCancel(cancelReqVO.getId(), BpmReasonEnum.CANCEL_PROCESS_INSTANCE_BY_START_USER.format(cancelReqVO.getReason())); } @Override public void cancelProcessInstanceByAdmin(Long userId, BpmProcessInstanceCancelReqVO cancelReqVO) { // 1.1 校验流程实例存在 ProcessInstance instance = getProcessInstance(cancelReqVO.getId()); if (instance == null) { throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS); } // 2. 取消流程 AdminUserRespDTO user = adminUserApi.getUser(userId); updateProcessInstanceCancel(cancelReqVO.getId(), BpmReasonEnum.CANCEL_PROCESS_INSTANCE_BY_ADMIN.format(user.getNickname(), cancelReqVO.getReason())); } private void updateProcessInstanceCancel(String id, String reason) { // 1. 更新流程实例 status runtimeService.setVariable(id, BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, BpmProcessInstanceStatusEnum.CANCEL.getStatus()); runtimeService.setVariable(id, BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON, reason); // 2. 结束流程 taskService.moveTaskToEnd(id); } @Override public void updateProcessInstanceReject(ProcessInstance processInstance, String reason) { runtimeService.setVariable(processInstance.getProcessInstanceId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, BpmProcessInstanceStatusEnum.REJECT.getStatus()); runtimeService.setVariable(processInstance.getProcessInstanceId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON, BpmReasonEnum.REJECT_TASK.format(reason)); } // ========== Event 事件相关方法 ========== @Override public void processProcessInstanceCompleted(ProcessInstance instance) { // 注意:需要基于 instance 设置租户编号,避免 Flowable 内部异步时,丢失租户编号 FlowableUtils.execute(instance.getTenantId(), () -> { // 1.1 获取当前状态 Integer status = (Integer) instance.getProcessVariables().get(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS); String reason = (String) instance.getProcessVariables().get(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON); // 1.2 当流程状态还是审批状态中,说明审批通过了,则变更下它的状态 // 为什么这么处理?因为流程完成,并且完成了,说明审批通过了 if (Objects.equals(status, BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { status = BpmProcessInstanceStatusEnum.APPROVE.getStatus(); runtimeService.setVariable(instance.getId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, status); } // 2. 发送对应的消息通知 if (Objects.equals(status, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) { messageService.sendMessageWhenProcessInstanceApprove(BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceApproveMessage(instance)); } else if (Objects.equals(status, BpmProcessInstanceStatusEnum.REJECT.getStatus())) { messageService.sendMessageWhenProcessInstanceReject( BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceRejectMessage(instance, reason)); } // 3. 发送流程实例的状态事件 processInstanceEventPublisher.sendProcessInstanceResultEvent( BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceStatusEvent(this, instance, status)); }); } } | ||
| 2 | \ No newline at end of file | 1 | \ No newline at end of file |
| 2 | +package cn.iocoder.yudao.module.bpm.service.task; | ||
| 3 | + | ||
| 4 | +import cn.hutool.core.collection.CollUtil; | ||
| 5 | +import cn.hutool.core.collection.ListUtil; | ||
| 6 | +import cn.hutool.core.lang.Assert; | ||
| 7 | +import cn.hutool.core.util.ArrayUtil; | ||
| 8 | +import cn.hutool.core.util.ObjectUtil; | ||
| 9 | +import cn.hutool.core.util.StrUtil; | ||
| 10 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 11 | +import cn.iocoder.yudao.framework.common.util.date.DateUtils; | ||
| 12 | +import cn.iocoder.yudao.framework.common.util.json.JsonUtils; | ||
| 13 | +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; | ||
| 14 | +import cn.iocoder.yudao.framework.common.util.object.PageUtils; | ||
| 15 | +import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; | ||
| 16 | +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO; | ||
| 17 | +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*; | ||
| 18 | +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO.ActivityNodeTask; | ||
| 19 | +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO; | ||
| 20 | +import cn.iocoder.yudao.module.bpm.convert.task.BpmProcessInstanceConvert; | ||
| 21 | +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO; | ||
| 22 | +import cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants; | ||
| 23 | +import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelTypeEnum; | ||
| 24 | +import cn.iocoder.yudao.module.bpm.enums.definition.BpmSimpleModelNodeType; | ||
| 25 | +import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum; | ||
| 26 | +import cn.iocoder.yudao.module.bpm.enums.task.BpmReasonEnum; | ||
| 27 | +import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum; | ||
| 28 | +import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateInvoker; | ||
| 29 | +import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.dept.BpmTaskCandidateStartUserSelectStrategy; | ||
| 30 | +import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants; | ||
| 31 | +import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnVariableConstants; | ||
| 32 | +import cn.iocoder.yudao.module.bpm.framework.flowable.core.event.BpmProcessInstanceEventPublisher; | ||
| 33 | +import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils; | ||
| 34 | +import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils; | ||
| 35 | +import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.SimpleModelUtils; | ||
| 36 | +import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService; | ||
| 37 | +import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService; | ||
| 38 | +import cn.iocoder.yudao.module.system.api.dept.DeptApi; | ||
| 39 | +import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; | ||
| 40 | +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; | ||
| 41 | +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; | ||
| 42 | +import jakarta.annotation.Resource; | ||
| 43 | +import jakarta.validation.Valid; | ||
| 44 | +import lombok.extern.slf4j.Slf4j; | ||
| 45 | +import org.flowable.bpmn.constants.BpmnXMLConstants; | ||
| 46 | +import org.flowable.bpmn.model.*; | ||
| 47 | +import org.flowable.engine.HistoryService; | ||
| 48 | +import org.flowable.engine.RuntimeService; | ||
| 49 | +import org.flowable.engine.history.HistoricActivityInstance; | ||
| 50 | +import org.flowable.engine.history.HistoricProcessInstance; | ||
| 51 | +import org.flowable.engine.history.HistoricProcessInstanceQuery; | ||
| 52 | +import org.flowable.engine.repository.ProcessDefinition; | ||
| 53 | +import org.flowable.engine.runtime.ProcessInstance; | ||
| 54 | +import org.flowable.task.api.history.HistoricTaskInstance; | ||
| 55 | +import org.springframework.context.annotation.Lazy; | ||
| 56 | +import org.springframework.stereotype.Service; | ||
| 57 | +import org.springframework.transaction.annotation.Transactional; | ||
| 58 | +import org.springframework.validation.annotation.Validated; | ||
| 59 | + | ||
| 60 | +import java.util.*; | ||
| 61 | + | ||
| 62 | +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | ||
| 63 | +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; | ||
| 64 | +import static cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO.ActivityNode; | ||
| 65 | +import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*; | ||
| 66 | +import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants.START_USER_NODE_ID; | ||
| 67 | +import static java.util.Arrays.asList; | ||
| 68 | +import static java.util.Collections.singletonList; | ||
| 69 | +import static org.flowable.bpmn.constants.BpmnXMLConstants.*; | ||
| 70 | + | ||
| 71 | +/** | ||
| 72 | + * 流程实例 Service 实现类 | ||
| 73 | + * <p> | ||
| 74 | + * ProcessDefinition & ProcessInstance & Execution & Task 的关系: | ||
| 75 | + * 1. <a href="https://blog.csdn.net/bobozai86/article/details/105210414" /> | ||
| 76 | + * <p> | ||
| 77 | + * HistoricProcessInstance & ProcessInstance 的关系: | ||
| 78 | + * 1. <a href=" https://my.oschina.net/843294669/blog/71902" /> | ||
| 79 | + * <p> | ||
| 80 | + * 简单来说,前者 = 历史 + 运行中的流程实例,后者仅是运行中的流程实例 | ||
| 81 | + * | ||
| 82 | + * @author 芋道源码 | ||
| 83 | + */ | ||
| 84 | +@Service | ||
| 85 | +@Validated | ||
| 86 | +@Slf4j | ||
| 87 | +public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService { | ||
| 88 | + | ||
| 89 | + @Resource | ||
| 90 | + private RuntimeService runtimeService; | ||
| 91 | + @Resource | ||
| 92 | + private HistoryService historyService; | ||
| 93 | + | ||
| 94 | + @Resource | ||
| 95 | + private BpmProcessDefinitionService processDefinitionService; | ||
| 96 | + @Resource | ||
| 97 | + @Lazy // 避免循环依赖 | ||
| 98 | + private BpmTaskService taskService; | ||
| 99 | + @Resource | ||
| 100 | + private BpmMessageService messageService; | ||
| 101 | + | ||
| 102 | + @Resource | ||
| 103 | + private AdminUserApi adminUserApi; | ||
| 104 | + @Resource | ||
| 105 | + private DeptApi deptApi; | ||
| 106 | + | ||
| 107 | + @Resource | ||
| 108 | + private BpmProcessInstanceEventPublisher processInstanceEventPublisher; | ||
| 109 | + | ||
| 110 | + @Resource | ||
| 111 | + private BpmTaskCandidateInvoker taskCandidateInvoker; | ||
| 112 | + | ||
| 113 | + // ========== Query 查询相关方法 ========== | ||
| 114 | + | ||
| 115 | + @Override | ||
| 116 | + public ProcessInstance getProcessInstance(String id) { | ||
| 117 | + return runtimeService.createProcessInstanceQuery() | ||
| 118 | + .includeProcessVariables() | ||
| 119 | + .processInstanceId(id) | ||
| 120 | + .singleResult(); | ||
| 121 | + } | ||
| 122 | + | ||
| 123 | + @Override | ||
| 124 | + public List<ProcessInstance> getProcessInstances(Set<String> ids) { | ||
| 125 | + return runtimeService.createProcessInstanceQuery().processInstanceIds(ids).list(); | ||
| 126 | + } | ||
| 127 | + | ||
| 128 | + @Override | ||
| 129 | + public HistoricProcessInstance getHistoricProcessInstance(String id) { | ||
| 130 | + return historyService.createHistoricProcessInstanceQuery().processInstanceId(id).includeProcessVariables().singleResult(); | ||
| 131 | + } | ||
| 132 | + | ||
| 133 | + @Override | ||
| 134 | + public List<HistoricProcessInstance> getHistoricProcessInstances(Set<String> ids) { | ||
| 135 | + return historyService.createHistoricProcessInstanceQuery().processInstanceIds(ids).list(); | ||
| 136 | + } | ||
| 137 | + | ||
| 138 | + @Override | ||
| 139 | + public PageResult<HistoricProcessInstance> getProcessInstancePage(Long userId, | ||
| 140 | + BpmProcessInstancePageReqVO pageReqVO) { | ||
| 141 | + // 通过 BpmProcessInstanceExtDO 表,先查询到对应的分页 | ||
| 142 | + HistoricProcessInstanceQuery processInstanceQuery = historyService.createHistoricProcessInstanceQuery() | ||
| 143 | + .includeProcessVariables() | ||
| 144 | + .processInstanceTenantId(FlowableUtils.getTenantId()) | ||
| 145 | + .orderByProcessInstanceStartTime().desc(); | ||
| 146 | + if (userId != null) { // 【我的流程】菜单时,需要传递该字段 | ||
| 147 | + processInstanceQuery.startedBy(String.valueOf(userId)); | ||
| 148 | + } else if (pageReqVO.getStartUserId() != null) { // 【管理流程】菜单时,才会传递该字段 | ||
| 149 | + processInstanceQuery.startedBy(String.valueOf(pageReqVO.getStartUserId())); | ||
| 150 | + } | ||
| 151 | + if (StrUtil.isNotEmpty(pageReqVO.getName())) { | ||
| 152 | + processInstanceQuery.processInstanceNameLike("%" + pageReqVO.getName() + "%"); | ||
| 153 | + } | ||
| 154 | + if (StrUtil.isNotEmpty(pageReqVO.getProcessDefinitionKey())) { | ||
| 155 | + processInstanceQuery.processDefinitionKey(pageReqVO.getProcessDefinitionKey()); | ||
| 156 | + } | ||
| 157 | + if (StrUtil.isNotEmpty(pageReqVO.getCategory())) { | ||
| 158 | + processInstanceQuery.processDefinitionCategory(pageReqVO.getCategory()); | ||
| 159 | + } | ||
| 160 | + if (pageReqVO.getStatus() != null) { | ||
| 161 | + processInstanceQuery.variableValueEquals(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, pageReqVO.getStatus()); | ||
| 162 | + } | ||
| 163 | + if (ArrayUtil.isNotEmpty(pageReqVO.getCreateTime())) { | ||
| 164 | + processInstanceQuery.startedAfter(DateUtils.of(pageReqVO.getCreateTime()[0])); | ||
| 165 | + processInstanceQuery.startedBefore(DateUtils.of(pageReqVO.getCreateTime()[1])); | ||
| 166 | + } | ||
| 167 | + // 查询数量 | ||
| 168 | + long processInstanceCount = processInstanceQuery.count(); | ||
| 169 | + if (processInstanceCount == 0) { | ||
| 170 | + return PageResult.empty(processInstanceCount); | ||
| 171 | + } | ||
| 172 | + // 查询列表 | ||
| 173 | + List<HistoricProcessInstance> processInstanceList = processInstanceQuery.listPage(PageUtils.getStart(pageReqVO), pageReqVO.getPageSize()); | ||
| 174 | + return new PageResult<>(processInstanceList, processInstanceCount); | ||
| 175 | + } | ||
| 176 | + | ||
| 177 | + | ||
| 178 | + private Map<String, String> getFormFieldsPermission(BpmnModel bpmnModel, | ||
| 179 | + String activityId, String taskId) { | ||
| 180 | + // 1. 获取流程活动编号。流程活动 Id 为空事,从流程任务中获取流程活动 Id | ||
| 181 | + if (StrUtil.isEmpty(activityId) && StrUtil.isNotEmpty(taskId)) { | ||
| 182 | + activityId = Optional.ofNullable(taskService.getHistoricTask(taskId)) | ||
| 183 | + .map(HistoricTaskInstance::getTaskDefinitionKey).orElse(null); | ||
| 184 | + } | ||
| 185 | + if (StrUtil.isEmpty(activityId)) { | ||
| 186 | + return null; | ||
| 187 | + } | ||
| 188 | + | ||
| 189 | + // 2. 从 BpmnModel 中解析表单字段权限 | ||
| 190 | + return BpmnModelUtils.parseFormFieldsPermission(bpmnModel, activityId); | ||
| 191 | + } | ||
| 192 | + | ||
| 193 | + @Override | ||
| 194 | + public BpmApprovalDetailRespVO getApprovalDetail(Long loginUserId, BpmApprovalDetailReqVO reqVO) { | ||
| 195 | + // 1.1 从 reqVO 中,读取公共变量 | ||
| 196 | + Long startUserId = loginUserId; // 流程发起人 | ||
| 197 | + HistoricProcessInstance historicProcessInstance = null; // 流程实例 | ||
| 198 | + Integer processInstanceStatus = BpmProcessInstanceStatusEnum.NOT_START.getStatus(); // 流程状态 | ||
| 199 | + Map<String, Object> processVariables = reqVO.getProcessVariables(); // 流程变量 | ||
| 200 | + // 1.2 如果是流程已发起的场景,则使用流程实例的数据 | ||
| 201 | + if (reqVO.getProcessInstanceId() != null) { | ||
| 202 | + historicProcessInstance = getHistoricProcessInstance(reqVO.getProcessInstanceId()); | ||
| 203 | + if (historicProcessInstance == null) { | ||
| 204 | + throw exception(ErrorCodeConstants.PROCESS_INSTANCE_NOT_EXISTS); | ||
| 205 | + } | ||
| 206 | + startUserId = Long.valueOf(historicProcessInstance.getStartUserId()); | ||
| 207 | + processInstanceStatus = FlowableUtils.getProcessInstanceStatus(historicProcessInstance); | ||
| 208 | + processVariables = historicProcessInstance.getProcessVariables(); | ||
| 209 | + } | ||
| 210 | + // 1.3 读取其它相关数据 | ||
| 211 | + ProcessDefinition processDefinition = processDefinitionService.getProcessDefinition( | ||
| 212 | + historicProcessInstance != null ? historicProcessInstance.getProcessDefinitionId() : reqVO.getProcessDefinitionId()); | ||
| 213 | + BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(processDefinition.getId()); | ||
| 214 | + BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(processDefinition.getId()); | ||
| 215 | + | ||
| 216 | + // 2.1 已结束 + 进行中的活动节点 | ||
| 217 | + List<ActivityNode> endActivityNodes = null; // 已结束的审批信息 | ||
| 218 | + List<ActivityNode> runActivityNodes = null; // 进行中的审批信息 | ||
| 219 | + List<HistoricActivityInstance> activities = null; // 流程实例列表 | ||
| 220 | + if (reqVO.getProcessInstanceId() != null) { | ||
| 221 | + activities = taskService.getActivityListByProcessInstanceId(reqVO.getProcessInstanceId()); | ||
| 222 | + List<HistoricTaskInstance> tasks = taskService.getTaskListByProcessInstanceId(reqVO.getProcessInstanceId(), true); | ||
| 223 | + endActivityNodes = getEndActivityNodeList(startUserId, bpmnModel, processDefinitionInfo, | ||
| 224 | + historicProcessInstance, processInstanceStatus, activities, tasks); | ||
| 225 | + runActivityNodes = getRunApproveNodeList(startUserId, bpmnModel, processDefinition, processVariables, activities, tasks); | ||
| 226 | + } | ||
| 227 | + | ||
| 228 | + // 2.2 流程已经结束,直接 return,无需预测 | ||
| 229 | + if (BpmProcessInstanceStatusEnum.isProcessEndStatus(processInstanceStatus)) { | ||
| 230 | + return buildApprovalDetail(reqVO, bpmnModel, processDefinition, processDefinitionInfo, historicProcessInstance, | ||
| 231 | + processInstanceStatus, endActivityNodes, runActivityNodes, null, null); | ||
| 232 | + } | ||
| 233 | + | ||
| 234 | + // 3.1 计算当前登录用户的待办任务 | ||
| 235 | + // TODO @jason:有一个极端情况,如果一个用户有 2 个 task A 和 B,A 已经通过,B 需要审核。这个时,通过 A 进来,todo 拿到 B,会不会表单权限不一致哈。 | ||
| 236 | + BpmTaskRespVO todoTask = taskService.getFirstTodoTask(loginUserId, reqVO.getProcessInstanceId()); | ||
| 237 | + | ||
| 238 | + // 3.2 预测未运行节点的审批信息 | ||
| 239 | + List<ActivityNode> simulateActivityNodes = getSimulateApproveNodeList(startUserId, bpmnModel, processDefinitionInfo, | ||
| 240 | + processVariables, activities); | ||
| 241 | + | ||
| 242 | + // 4. 拼接最终数据 | ||
| 243 | + return buildApprovalDetail(reqVO, bpmnModel, processDefinition, processDefinitionInfo, historicProcessInstance, | ||
| 244 | + processInstanceStatus, endActivityNodes, runActivityNodes, simulateActivityNodes, todoTask); | ||
| 245 | + } | ||
| 246 | + | ||
| 247 | + /** | ||
| 248 | + * 拼接审批详情的最终数据 | ||
| 249 | + * <p> | ||
| 250 | + * 主要是,拼接审批人的用户信息、部门信息 | ||
| 251 | + */ | ||
| 252 | + private BpmApprovalDetailRespVO buildApprovalDetail(BpmApprovalDetailReqVO reqVO, | ||
| 253 | + BpmnModel bpmnModel, | ||
| 254 | + ProcessDefinition processDefinition, | ||
| 255 | + BpmProcessDefinitionInfoDO processDefinitionInfo, | ||
| 256 | + HistoricProcessInstance processInstance, | ||
| 257 | + Integer processInstanceStatus, | ||
| 258 | + List<ActivityNode> endApprovalNodeInfos, | ||
| 259 | + List<ActivityNode> runningApprovalNodeInfos, | ||
| 260 | + List<ActivityNode> simulateApprovalNodeInfos, | ||
| 261 | + BpmTaskRespVO todoTask) { | ||
| 262 | + // 1. 获取所有需要读取用户信息的 userIds | ||
| 263 | + List<ActivityNode> approveNodes = newArrayList(asList(endApprovalNodeInfos, runningApprovalNodeInfos, simulateApprovalNodeInfos)); | ||
| 264 | + Set<Long> userIds = BpmProcessInstanceConvert.INSTANCE.parseUserIds(processInstance, approveNodes, todoTask); | ||
| 265 | + Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds); | ||
| 266 | + Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId)); | ||
| 267 | + | ||
| 268 | + // 2. 表单权限 | ||
| 269 | + Map<String, String> formFieldsPermission = getFormFieldsPermission(bpmnModel, reqVO.getActivityId(), reqVO.getTaskId()); | ||
| 270 | + | ||
| 271 | + // 3. 拼接数据 | ||
| 272 | + return BpmProcessInstanceConvert.INSTANCE.buildApprovalDetail(bpmnModel, processDefinition, processDefinitionInfo, processInstance, | ||
| 273 | + processInstanceStatus, approveNodes, todoTask, formFieldsPermission, userMap, deptMap); | ||
| 274 | + } | ||
| 275 | + | ||
| 276 | + /** | ||
| 277 | + * 获得【已结束】的活动节点们 | ||
| 278 | + */ | ||
| 279 | + private List<ActivityNode> getEndActivityNodeList(Long startUserId, BpmnModel bpmnModel, | ||
| 280 | + BpmProcessDefinitionInfoDO processDefinitionInfo, | ||
| 281 | + HistoricProcessInstance historicProcessInstance, Integer processInstanceStatus, | ||
| 282 | + List<HistoricActivityInstance> activities, List<HistoricTaskInstance> tasks) { | ||
| 283 | + // 遍历 tasks 列表,只处理已结束的 UserTask | ||
| 284 | + // 为什么不通过 activities 呢?因为,加签场景下,它只存在于 tasks,没有 activities,导致如果遍历 activities 的话,它无法成为一个节点 | ||
| 285 | + List<HistoricTaskInstance> endTasks = filterList(tasks, task -> task.getEndTime() != null); | ||
| 286 | + List<ActivityNode> approvalNodes = convertList(endTasks, task -> { | ||
| 287 | + FlowElement flowNode = BpmnModelUtils.getFlowElementById(bpmnModel, task.getTaskDefinitionKey()); | ||
| 288 | + ActivityNode activityNode = new ActivityNode().setId(task.getTaskDefinitionKey()).setName(task.getName()) | ||
| 289 | + .setNodeType(START_USER_NODE_ID.equals(task.getTaskDefinitionKey()) ? | ||
| 290 | + BpmSimpleModelNodeType.START_USER_NODE.getType() : BpmSimpleModelNodeType.APPROVE_NODE.getType()) | ||
| 291 | + .setStatus(FlowableUtils.getTaskStatus(task)) | ||
| 292 | + .setCandidateStrategy(BpmnModelUtils.parseCandidateStrategy(flowNode)) | ||
| 293 | + .setStartTime(DateUtils.of(task.getCreateTime())).setEndTime(DateUtils.of(task.getEndTime())) | ||
| 294 | + .setTasks(singletonList(BpmProcessInstanceConvert.INSTANCE.buildApprovalTaskInfo(task))); | ||
| 295 | + // 如果是取消状态,则跳过 | ||
| 296 | + if (BpmTaskStatusEnum.isCancelStatus(activityNode.getStatus())) { | ||
| 297 | + return null; | ||
| 298 | + } | ||
| 299 | + return activityNode; | ||
| 300 | + }); | ||
| 301 | + | ||
| 302 | + // 遍历 activities,只处理已结束的 StartEvent、EndEvent | ||
| 303 | + List<HistoricActivityInstance> endActivities = filterList(activities, activity -> activity.getEndTime() != null | ||
| 304 | + && (StrUtil.equalsAny(activity.getActivityType(), ELEMENT_EVENT_START, ELEMENT_EVENT_END))); | ||
| 305 | + endActivities.forEach(activity -> { | ||
| 306 | + // StartEvent:只处理 BPMN 的场景。因为,SIMPLE 情况下,已经有 START_USER_NODE 节点 | ||
| 307 | + if (ELEMENT_EVENT_START.equals(activity.getActivityType()) | ||
| 308 | + && BpmModelTypeEnum.BPMN.getType().equals(processDefinitionInfo.getModelType())) { | ||
| 309 | + ActivityNodeTask startTask = new ActivityNodeTask().setId(BpmnModelConstants.START_USER_NODE_ID) | ||
| 310 | + .setAssignee(startUserId).setStatus(BpmTaskStatusEnum.APPROVE.getStatus()); | ||
| 311 | + ActivityNode startNode = new ActivityNode().setId(startTask.getId()) | ||
| 312 | + .setName(BpmSimpleModelNodeType.START_USER_NODE.getName()) | ||
| 313 | + .setNodeType(BpmSimpleModelNodeType.START_USER_NODE.getType()) | ||
| 314 | + .setStatus(startTask.getStatus()).setTasks(ListUtil.of(startTask)) | ||
| 315 | + .setStartTime(DateUtils.of(activity.getStartTime())).setEndTime(DateUtils.of(activity.getEndTime())); | ||
| 316 | + approvalNodes.add(0, startNode); | ||
| 317 | + return; | ||
| 318 | + } | ||
| 319 | + // EndEvent | ||
| 320 | + if (ELEMENT_EVENT_END.equals(activity.getActivityType())) { | ||
| 321 | + if (BpmProcessInstanceStatusEnum.isRejectStatus(processInstanceStatus)) { | ||
| 322 | + // 拒绝情况下,不需要展示 EndEvent 结束节点。原因是:前端已经展示 x 效果,无需重复展示 | ||
| 323 | + return; | ||
| 324 | + } | ||
| 325 | + ActivityNode endNode = new ActivityNode().setId(activity.getId()) | ||
| 326 | + .setName(BpmSimpleModelNodeType.END_NODE.getName()) | ||
| 327 | + .setNodeType(BpmSimpleModelNodeType.END_NODE.getType()).setStatus(processInstanceStatus) | ||
| 328 | + .setStartTime(DateUtils.of(activity.getStartTime())).setEndTime(DateUtils.of(activity.getEndTime())); | ||
| 329 | + String reason = FlowableUtils.getProcessInstanceReason(historicProcessInstance); | ||
| 330 | + if (StrUtil.isNotEmpty(reason)) { | ||
| 331 | + endNode.setTasks(singletonList(new ActivityNodeTask().setId(endNode.getId()) | ||
| 332 | + .setStatus(endNode.getStatus()).setReason(reason))); | ||
| 333 | + } | ||
| 334 | + approvalNodes.add(endNode); | ||
| 335 | + } | ||
| 336 | + }); | ||
| 337 | + return approvalNodes; | ||
| 338 | + } | ||
| 339 | + | ||
| 340 | + /** | ||
| 341 | + * 获得【进行中】的活动节点们 | ||
| 342 | + */ | ||
| 343 | + private List<ActivityNode> getRunApproveNodeList(Long startUserId, | ||
| 344 | + BpmnModel bpmnModel, | ||
| 345 | + ProcessDefinition processDefinition, | ||
| 346 | + Map<String, Object> processVariables, | ||
| 347 | + List<HistoricActivityInstance> activities, | ||
| 348 | + List<HistoricTaskInstance> tasks) { | ||
| 349 | + // 构建运行中的任务,基于 activityId 分组 | ||
| 350 | + List<HistoricActivityInstance> runActivities = filterList(activities, activity -> activity.getEndTime() == null | ||
| 351 | + && (StrUtil.equalsAny(activity.getActivityType(), ELEMENT_TASK_USER))); | ||
| 352 | + Map<String, List<HistoricActivityInstance>> runningTaskMap = convertMultiMap(runActivities, HistoricActivityInstance::getActivityId); | ||
| 353 | + | ||
| 354 | + // 按照 activityId 分组,构建 ApprovalNodeInfo 节点 | ||
| 355 | + Map<String, HistoricTaskInstance> taskMap = convertMap(tasks, HistoricTaskInstance::getId); | ||
| 356 | + return convertList(runningTaskMap.entrySet(), entry -> { | ||
| 357 | + String activityId = entry.getKey(); | ||
| 358 | + List<HistoricActivityInstance> taskActivities = entry.getValue(); | ||
| 359 | + // 构建活动节点 | ||
| 360 | + FlowElement flowNode = BpmnModelUtils.getFlowElementById(bpmnModel, activityId); | ||
| 361 | + HistoricActivityInstance firstActivity = CollUtil.getFirst(taskActivities); // 取第一个任务,会签/或签的任务,开始时间相同 | ||
| 362 | + ActivityNode activityNode = new ActivityNode().setId(firstActivity.getActivityId()).setName(firstActivity.getActivityName()) | ||
| 363 | + .setNodeType(BpmSimpleModelNodeType.APPROVE_NODE.getType()).setStatus(BpmTaskStatusEnum.RUNNING.getStatus()) | ||
| 364 | + .setCandidateStrategy(BpmnModelUtils.parseCandidateStrategy(flowNode)) | ||
| 365 | + .setStartTime(DateUtils.of(CollUtil.getFirst(taskActivities).getStartTime())) | ||
| 366 | + .setTasks(new ArrayList<>()); | ||
| 367 | + // 处理每个任务的 tasks 属性 | ||
| 368 | + for (HistoricActivityInstance activity : taskActivities) { | ||
| 369 | + HistoricTaskInstance task = taskMap.get(activity.getTaskId()); | ||
| 370 | + activityNode.getTasks().add(BpmProcessInstanceConvert.INSTANCE.buildApprovalTaskInfo(task)); | ||
| 371 | + // 加签子任务,需要过滤掉已经完成的加签子任务 | ||
| 372 | + List<HistoricTaskInstance> childrenTasks = filterList( | ||
| 373 | + taskService.getAllChildrenTaskListByParentTaskId(activity.getTaskId(), tasks), | ||
| 374 | + childTask -> childTask.getEndTime() == null); | ||
| 375 | + if (CollUtil.isNotEmpty(childrenTasks)) { | ||
| 376 | + activityNode.getTasks().addAll(convertList(childrenTasks, BpmProcessInstanceConvert.INSTANCE::buildApprovalTaskInfo)); | ||
| 377 | + } | ||
| 378 | + } | ||
| 379 | + // 处理每个任务的 candidateUsers 属性:如果是依次审批,需要预测它的后续审批人。因为 Task 是审批完一个,创建一个新的 Task | ||
| 380 | + if (BpmnModelUtils.isSequentialUserTask(flowNode)) { | ||
| 381 | + List<Long> candidateUserIds = getTaskCandidateUserList(bpmnModel, flowNode.getId(), | ||
| 382 | + startUserId, processDefinition.getId(), processVariables); | ||
| 383 | + // 截取当前审批人位置后面的候选人,不包含当前审批人 | ||
| 384 | + ActivityNodeTask approvalTaskInfo = CollUtil.getFirst(activityNode.getTasks()); | ||
| 385 | + Assert.notNull(approvalTaskInfo, "任务不能为空"); | ||
| 386 | + int index = CollUtil.indexOf(candidateUserIds, userId -> ObjectUtils.equalsAny(userId, approvalTaskInfo.getOwner(), | ||
| 387 | + approvalTaskInfo.getAssignee())); // 委派或者向前加签情况,需要先比较 owner | ||
| 388 | + activityNode.setCandidateUserIds(CollUtil.sub(candidateUserIds, index + 1, candidateUserIds.size())); | ||
| 389 | + } | ||
| 390 | + return activityNode; | ||
| 391 | + }); | ||
| 392 | + } | ||
| 393 | + | ||
| 394 | + /** | ||
| 395 | + * 获得【预测(未来)】的活动节点们 | ||
| 396 | + */ | ||
| 397 | + private List<ActivityNode> getSimulateApproveNodeList(Long startUserId, BpmnModel bpmnModel, | ||
| 398 | + BpmProcessDefinitionInfoDO processDefinitionInfo, | ||
| 399 | + Map<String, Object> processVariables, | ||
| 400 | + List<HistoricActivityInstance> activities) { | ||
| 401 | + // TODO @芋艿:【可优化】在驳回场景下,未来的预测准确性不高。原因是,驳回后,HistoricActivityInstance 包括了历史的操作,不是只有 startEvent 到当前节点的记录 | ||
| 402 | + Set<String> runActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId); | ||
| 403 | + // 情况一:BPMN 设计器 | ||
| 404 | + if (Objects.equals(BpmModelTypeEnum.BPMN.getType(), processDefinitionInfo.getModelType())) { | ||
| 405 | + List<FlowElement> flowElements = BpmnModelUtils.simulateProcess(bpmnModel, processVariables); | ||
| 406 | + return convertList(flowElements, flowElement -> buildNotRunApproveNodeForBpmn(startUserId, bpmnModel, | ||
| 407 | + processDefinitionInfo, processVariables, flowElement, runActivityIds)); | ||
| 408 | + } | ||
| 409 | + // 情况二:SIMPLE 设计器 | ||
| 410 | + if (Objects.equals(BpmModelTypeEnum.SIMPLE.getType(), processDefinitionInfo.getModelType())) { | ||
| 411 | + BpmSimpleModelNodeVO simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class); | ||
| 412 | + List<BpmSimpleModelNodeVO> simpleNodes = SimpleModelUtils.simulateProcess(simpleModel, processVariables); | ||
| 413 | + return convertList(simpleNodes, simpleNode -> buildNotRunApproveNodeForSimple(startUserId, bpmnModel, | ||
| 414 | + processDefinitionInfo, processVariables, simpleNode, runActivityIds)); | ||
| 415 | + } | ||
| 416 | + throw new IllegalArgumentException("未知设计器类型:" + processDefinitionInfo.getModelType()); | ||
| 417 | + } | ||
| 418 | + | ||
| 419 | + private ActivityNode buildNotRunApproveNodeForSimple(Long startUserId, BpmnModel bpmnModel, | ||
| 420 | + BpmProcessDefinitionInfoDO processDefinitionInfo, Map<String, Object> processVariables, | ||
| 421 | + BpmSimpleModelNodeVO node, Set<String> runActivityIds) { | ||
| 422 | + // TODO @芋艿:【可优化】在驳回场景下,未来的预测准确性不高。原因是,驳回后,HistoricActivityInstance 包括了历史的操作,不是只有 startEvent 到当前节点的记录 | ||
| 423 | + if (runActivityIds.contains(node.getId())) { | ||
| 424 | + return null; | ||
| 425 | + } | ||
| 426 | + | ||
| 427 | + ActivityNode activityNode = new ActivityNode().setId(node.getId()).setName(node.getName()) | ||
| 428 | + .setNodeType(node.getType()).setCandidateStrategy(node.getCandidateStrategy()) | ||
| 429 | + .setStatus(BpmTaskStatusEnum.NOT_START.getStatus()); | ||
| 430 | + | ||
| 431 | + // 1. 开始节点/审批节点 | ||
| 432 | + if (ObjectUtils.equalsAny(node.getType(), | ||
| 433 | + BpmSimpleModelNodeType.START_USER_NODE.getType(), | ||
| 434 | + BpmSimpleModelNodeType.APPROVE_NODE.getType())) { | ||
| 435 | + List<Long> candidateUserIds = getTaskCandidateUserList(bpmnModel, node.getId(), | ||
| 436 | + startUserId, processDefinitionInfo.getProcessDefinitionId(), processVariables); | ||
| 437 | + activityNode.setCandidateUserIds(candidateUserIds); | ||
| 438 | + return activityNode; | ||
| 439 | + } | ||
| 440 | + | ||
| 441 | + // 2. 结束节点 | ||
| 442 | + if (BpmSimpleModelNodeType.END_NODE.getType().equals(node.getType())) { | ||
| 443 | + return activityNode; | ||
| 444 | + } | ||
| 445 | + | ||
| 446 | + // 3. 抄送节点 | ||
| 447 | + if (CollUtil.isEmpty(runActivityIds) && // 流程发起时:需要展示抄送节点,用于选择抄送人 | ||
| 448 | + BpmSimpleModelNodeType.COPY_NODE.getType().equals(node.getType())) { | ||
| 449 | + return activityNode; | ||
| 450 | + } | ||
| 451 | + return null; | ||
| 452 | + } | ||
| 453 | + | ||
| 454 | + private ActivityNode buildNotRunApproveNodeForBpmn(Long startUserId, BpmnModel bpmnModel, | ||
| 455 | + BpmProcessDefinitionInfoDO processDefinitionInfo, Map<String, Object> processVariables, | ||
| 456 | + FlowElement node, Set<String> runActivityIds) { | ||
| 457 | + if (runActivityIds.contains(node.getId())) { | ||
| 458 | + return null; | ||
| 459 | + } | ||
| 460 | + ActivityNode activityNode = new ActivityNode().setId(node.getId()).setStatus(BpmTaskStatusEnum.NOT_START.getStatus()); | ||
| 461 | + | ||
| 462 | + // 1. 开始节点 | ||
| 463 | + if (node instanceof StartEvent) { | ||
| 464 | + return activityNode.setName(BpmSimpleModelNodeType.START_USER_NODE.getName()) | ||
| 465 | + .setNodeType(BpmSimpleModelNodeType.START_USER_NODE.getType()); | ||
| 466 | + } | ||
| 467 | + | ||
| 468 | + // 2. 审批节点 | ||
| 469 | + if (node instanceof UserTask) { | ||
| 470 | + List<Long> candidateUserIds = getTaskCandidateUserList(bpmnModel, node.getId(), | ||
| 471 | + startUserId, processDefinitionInfo.getProcessDefinitionId(), processVariables); | ||
| 472 | + return activityNode.setName(node.getName()).setNodeType(BpmSimpleModelNodeType.APPROVE_NODE.getType()) | ||
| 473 | + .setCandidateStrategy(BpmnModelUtils.parseCandidateStrategy(node)) | ||
| 474 | + .setCandidateUserIds(candidateUserIds); | ||
| 475 | + } | ||
| 476 | + | ||
| 477 | + // 3. 结束节点 | ||
| 478 | + if (node instanceof EndEvent) { | ||
| 479 | + return activityNode.setName(BpmSimpleModelNodeType.END_NODE.getName()) | ||
| 480 | + .setNodeType(BpmSimpleModelNodeType.END_NODE.getType()); | ||
| 481 | + } | ||
| 482 | + return null; | ||
| 483 | + } | ||
| 484 | + | ||
| 485 | + private List<Long> getTaskCandidateUserList(BpmnModel bpmnModel, String activityId, | ||
| 486 | + Long startUserId, String processDefinitionId, Map<String, Object> processVariables) { | ||
| 487 | + Set<Long> userIds = taskCandidateInvoker.calculateUsersByActivity(bpmnModel, activityId, | ||
| 488 | + startUserId, processDefinitionId, processVariables); | ||
| 489 | + return new ArrayList<>(userIds); | ||
| 490 | + } | ||
| 491 | + | ||
| 492 | + @Override | ||
| 493 | + public BpmProcessInstanceBpmnModelViewRespVO getProcessInstanceBpmnModelView(String id) { | ||
| 494 | + // 1.1 获得流程实例 | ||
| 495 | + HistoricProcessInstance processInstance = getHistoricProcessInstance(id); | ||
| 496 | + if (processInstance == null) { | ||
| 497 | + return null; | ||
| 498 | + } | ||
| 499 | + // 1.2 获得流程定义 | ||
| 500 | + BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(processInstance.getProcessDefinitionId()); | ||
| 501 | + if (bpmnModel == null) { | ||
| 502 | + return null; | ||
| 503 | + } | ||
| 504 | + BpmSimpleModelNodeVO simpleModel = null; | ||
| 505 | + BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo( | ||
| 506 | + processInstance.getProcessDefinitionId()); | ||
| 507 | + if (processDefinitionInfo != null && BpmModelTypeEnum.SIMPLE.getType().equals(processDefinitionInfo.getModelType())) { | ||
| 508 | + simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class); | ||
| 509 | + } | ||
| 510 | + // 1.3 获得流程实例对应的活动实例列表 + 任务列表 | ||
| 511 | + List<HistoricActivityInstance> activities = taskService.getActivityListByProcessInstanceId(id); | ||
| 512 | + List<HistoricTaskInstance> tasks = taskService.getTaskListByProcessInstanceId(id, true); | ||
| 513 | + | ||
| 514 | + // 2.1 拼接进度信息 | ||
| 515 | + Set<String> unfinishedTaskActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId, | ||
| 516 | + activityInstance -> activityInstance.getEndTime() == null); | ||
| 517 | + Set<String> finishedTaskActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId, | ||
| 518 | + activityInstance -> activityInstance.getEndTime() != null | ||
| 519 | + && ObjectUtil.notEqual(activityInstance.getActivityType(), BpmnXMLConstants.ELEMENT_SEQUENCE_FLOW)); | ||
| 520 | + Set<String> finishedSequenceFlowActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId, | ||
| 521 | + activityInstance -> activityInstance.getEndTime() != null | ||
| 522 | + && ObjectUtil.equals(activityInstance.getActivityType(), BpmnXMLConstants.ELEMENT_SEQUENCE_FLOW)); | ||
| 523 | + // 特殊:会签情况下,会有部分已完成(审批)、部分未完成(待审批),此时需要 finishedTaskActivityIds 移除掉 | ||
| 524 | + finishedTaskActivityIds.removeAll(unfinishedTaskActivityIds); | ||
| 525 | + // 特殊:如果流程实例被拒绝,则需要计算是哪个活动节点。 | ||
| 526 | + // 注意,只取最后一个。因为会存在多次拒绝的情况,拒绝驳回到指定节点 | ||
| 527 | + Set<String> rejectTaskActivityIds = CollUtil.newHashSet(); | ||
| 528 | + if (BpmProcessInstanceStatusEnum.isRejectStatus(FlowableUtils.getProcessInstanceStatus(processInstance))) { | ||
| 529 | + tasks.stream() | ||
| 530 | + .filter(task -> BpmTaskStatusEnum.isRejectStatus(FlowableUtils.getTaskStatus(task))) | ||
| 531 | + .max(Comparator.comparing(HistoricTaskInstance::getEndTime)) | ||
| 532 | + .ifPresent(reject -> rejectTaskActivityIds.add(reject.getTaskDefinitionKey())); | ||
| 533 | + finishedTaskActivityIds.removeAll(rejectTaskActivityIds); | ||
| 534 | + } | ||
| 535 | + | ||
| 536 | + // 2.2 拼接基础信息 | ||
| 537 | + Set<Long> userIds = BpmProcessInstanceConvert.INSTANCE.parseUserIds02(processInstance, tasks); | ||
| 538 | + Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds); | ||
| 539 | + Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId)); | ||
| 540 | + return BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceBpmnModelView(processInstance, tasks, bpmnModel, simpleModel, | ||
| 541 | + unfinishedTaskActivityIds, finishedTaskActivityIds, finishedSequenceFlowActivityIds, rejectTaskActivityIds, | ||
| 542 | + userMap, deptMap); | ||
| 543 | + } | ||
| 544 | + | ||
| 545 | + // ========== Update 写入相关方法 ========== | ||
| 546 | + | ||
| 547 | + @Override | ||
| 548 | + @Transactional(rollbackFor = Exception.class) | ||
| 549 | + public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqVO createReqVO) { | ||
| 550 | + // 获得流程定义 | ||
| 551 | + ProcessDefinition definition = processDefinitionService.getProcessDefinition(createReqVO.getProcessDefinitionId()); | ||
| 552 | + // 发起流程 | ||
| 553 | + return createProcessInstance0(userId, definition, createReqVO.getVariables(), null, | ||
| 554 | + createReqVO.getStartUserSelectAssignees()); | ||
| 555 | + } | ||
| 556 | + | ||
| 557 | + @Override | ||
| 558 | + public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO createReqDTO) { | ||
| 559 | + // 获得流程定义 | ||
| 560 | + ProcessDefinition definition = processDefinitionService.getActiveProcessDefinition(createReqDTO.getProcessDefinitionKey()); | ||
| 561 | + // 发起流程 | ||
| 562 | + return createProcessInstance0(userId, definition, createReqDTO.getVariables(), createReqDTO.getBusinessKey(), | ||
| 563 | + createReqDTO.getStartUserSelectAssignees()); | ||
| 564 | + } | ||
| 565 | + | ||
| 566 | + private String createProcessInstance0(Long userId, ProcessDefinition definition, | ||
| 567 | + Map<String, Object> variables, String businessKey, | ||
| 568 | + Map<String, List<Long>> startUserSelectAssignees) { | ||
| 569 | + // 1.1 校验流程定义 | ||
| 570 | + if (definition == null) { | ||
| 571 | + throw exception(PROCESS_DEFINITION_NOT_EXISTS); | ||
| 572 | + } | ||
| 573 | + if (definition.isSuspended()) { | ||
| 574 | + throw exception(PROCESS_DEFINITION_IS_SUSPENDED); | ||
| 575 | + } | ||
| 576 | + BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(definition.getId()); | ||
| 577 | + if (processDefinitionInfo == null) { | ||
| 578 | + throw exception(PROCESS_DEFINITION_NOT_EXISTS); | ||
| 579 | + } | ||
| 580 | + // 1.2 校验是否能够发起 | ||
| 581 | + if (!processDefinitionService.canUserStartProcessDefinition(processDefinitionInfo, userId)) { | ||
| 582 | + throw exception(PROCESS_INSTANCE_START_USER_CAN_START); | ||
| 583 | + } | ||
| 584 | + // 1.3 校验发起人自选审批人 | ||
| 585 | + validateStartUserSelectAssignees(definition, startUserSelectAssignees); | ||
| 586 | + | ||
| 587 | + // 2. 创建流程实例 | ||
| 588 | + if (variables == null) { | ||
| 589 | + variables = new HashMap<>(); | ||
| 590 | + } | ||
| 591 | + FlowableUtils.filterProcessInstanceFormVariable(variables); // 过滤一下,避免 ProcessInstance 系统级的变量被占用 | ||
| 592 | + variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_ID, userId); // 设置流程变量,发起人 ID | ||
| 593 | + variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, // 流程实例状态:审批中 | ||
| 594 | + BpmProcessInstanceStatusEnum.RUNNING.getStatus()); | ||
| 595 | + if (CollUtil.isNotEmpty(startUserSelectAssignees)) { | ||
| 596 | + variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES, startUserSelectAssignees); | ||
| 597 | + } | ||
| 598 | + ProcessInstance instance = runtimeService.createProcessInstanceBuilder() | ||
| 599 | + .processDefinitionId(definition.getId()) | ||
| 600 | + .businessKey(businessKey) | ||
| 601 | + .name(definition.getName().trim()) | ||
| 602 | + .variables(variables) | ||
| 603 | + .start(); | ||
| 604 | + return instance.getId(); | ||
| 605 | + } | ||
| 606 | + | ||
| 607 | + private void validateStartUserSelectAssignees(ProcessDefinition definition, Map<String, List<Long>> startUserSelectAssignees) { | ||
| 608 | + // 1. 获得发起人自选审批人的 UserTask/ServiceTask 列表 | ||
| 609 | + BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(definition.getId()); | ||
| 610 | + List<Task> tasks = BpmTaskCandidateStartUserSelectStrategy.getStartUserSelectTaskList(bpmnModel); | ||
| 611 | + if (CollUtil.isEmpty(tasks)) { | ||
| 612 | + return; | ||
| 613 | + } | ||
| 614 | + | ||
| 615 | + // 2. 校验发起人自选审批人的审批人和抄送人是否都配置了 | ||
| 616 | + tasks.forEach(task -> { | ||
| 617 | + List<Long> assignees = startUserSelectAssignees != null ? startUserSelectAssignees.get(task.getId()) : null; | ||
| 618 | + if (CollUtil.isEmpty(assignees)) { | ||
| 619 | + throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_CONFIG, task.getName()); | ||
| 620 | + } | ||
| 621 | + Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(assignees); | ||
| 622 | + assignees.forEach(assignee -> { | ||
| 623 | + if (userMap.get(assignee) == null) { | ||
| 624 | + throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_EXISTS, task.getName(), assignee); | ||
| 625 | + } | ||
| 626 | + }); | ||
| 627 | + }); | ||
| 628 | + } | ||
| 629 | + | ||
| 630 | + @Override | ||
| 631 | + public void cancelProcessInstanceByStartUser(Long userId, @Valid BpmProcessInstanceCancelReqVO cancelReqVO) { | ||
| 632 | + // 1.1 校验流程实例存在 | ||
| 633 | + ProcessInstance instance = getProcessInstance(cancelReqVO.getId()); | ||
| 634 | + if (instance == null) { | ||
| 635 | + throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS); | ||
| 636 | + } | ||
| 637 | + // 1.2 只能取消自己的 | ||
| 638 | + if (!Objects.equals(instance.getStartUserId(), String.valueOf(userId))) { | ||
| 639 | + throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF); | ||
| 640 | + } | ||
| 641 | + | ||
| 642 | + // 2. 取消流程 | ||
| 643 | + updateProcessInstanceCancel(cancelReqVO.getId(), | ||
| 644 | + BpmReasonEnum.CANCEL_PROCESS_INSTANCE_BY_START_USER.format(cancelReqVO.getReason())); | ||
| 645 | + } | ||
| 646 | + | ||
| 647 | + @Override | ||
| 648 | + public void cancelProcessInstanceByAdmin(Long userId, BpmProcessInstanceCancelReqVO cancelReqVO) { | ||
| 649 | + // 1.1 校验流程实例存在 | ||
| 650 | + ProcessInstance instance = getProcessInstance(cancelReqVO.getId()); | ||
| 651 | + if (instance == null) { | ||
| 652 | + throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS); | ||
| 653 | + } | ||
| 654 | + | ||
| 655 | + // 2. 取消流程 | ||
| 656 | + AdminUserRespDTO user = adminUserApi.getUser(userId); | ||
| 657 | + updateProcessInstanceCancel(cancelReqVO.getId(), | ||
| 658 | + BpmReasonEnum.CANCEL_PROCESS_INSTANCE_BY_ADMIN.format(user.getNickname(), cancelReqVO.getReason())); | ||
| 659 | + } | ||
| 660 | + | ||
| 661 | + private void updateProcessInstanceCancel(String id, String reason) { | ||
| 662 | + // 1. 更新流程实例 status | ||
| 663 | + runtimeService.setVariable(id, BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, | ||
| 664 | + BpmProcessInstanceStatusEnum.CANCEL.getStatus()); | ||
| 665 | + runtimeService.setVariable(id, BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON, reason); | ||
| 666 | + | ||
| 667 | + // 2. 结束流程 | ||
| 668 | + taskService.moveTaskToEnd(id); | ||
| 669 | + } | ||
| 670 | + | ||
| 671 | + @Override | ||
| 672 | + public void updateProcessInstanceReject(ProcessInstance processInstance, String reason) { | ||
| 673 | + runtimeService.setVariable(processInstance.getProcessInstanceId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, | ||
| 674 | + BpmProcessInstanceStatusEnum.REJECT.getStatus()); | ||
| 675 | + runtimeService.setVariable(processInstance.getProcessInstanceId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON, | ||
| 676 | + BpmReasonEnum.REJECT_TASK.format(reason)); | ||
| 677 | + } | ||
| 678 | + | ||
| 679 | + // ========== Event 事件相关方法 ========== | ||
| 680 | + | ||
| 681 | + @Override | ||
| 682 | + public void processProcessInstanceCompleted(ProcessInstance instance) { | ||
| 683 | + // 注意:需要基于 instance 设置租户编号,避免 Flowable 内部异步时,丢失租户编号 | ||
| 684 | + FlowableUtils.execute(instance.getTenantId(), () -> { | ||
| 685 | + // 1.1 获取当前状态 | ||
| 686 | + Integer status = (Integer) instance.getProcessVariables().get(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS); | ||
| 687 | + String reason = (String) instance.getProcessVariables().get(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON); | ||
| 688 | + // 1.2 当流程状态还是审批状态中,说明审批通过了,则变更下它的状态 | ||
| 689 | + // 为什么这么处理?因为流程完成,并且完成了,说明审批通过了 | ||
| 690 | + if (Objects.equals(status, BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { | ||
| 691 | + status = BpmProcessInstanceStatusEnum.APPROVE.getStatus(); | ||
| 692 | + runtimeService.setVariable(instance.getId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, status); | ||
| 693 | + } | ||
| 694 | + | ||
| 695 | + // 2. 发送对应的消息通知 | ||
| 696 | + if (Objects.equals(status, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) { | ||
| 697 | + messageService.sendMessageWhenProcessInstanceApprove(BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceApproveMessage(instance)); | ||
| 698 | + } else if (Objects.equals(status, BpmProcessInstanceStatusEnum.REJECT.getStatus())) { | ||
| 699 | + messageService.sendMessageWhenProcessInstanceReject( | ||
| 700 | + BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceRejectMessage(instance, reason)); | ||
| 701 | + } | ||
| 702 | + | ||
| 703 | + // 3. 发送流程实例的状态事件 | ||
| 704 | + processInstanceEventPublisher.sendProcessInstanceResultEvent( | ||
| 705 | + BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceStatusEvent(this, instance, status)); | ||
| 706 | + }); | ||
| 707 | + } | ||
| 708 | + | ||
| 709 | +} |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
| @@ -12,6 +12,7 @@ import cn.iocoder.yudao.framework.common.util.object.PageUtils; | @@ -12,6 +12,7 @@ import cn.iocoder.yudao.framework.common.util.object.PageUtils; | ||
| 12 | import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; | 12 | import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; |
| 13 | import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*; | 13 | import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*; |
| 14 | import cn.iocoder.yudao.module.bpm.convert.task.BpmTaskConvert; | 14 | import cn.iocoder.yudao.module.bpm.convert.task.BpmTaskConvert; |
| 15 | +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; | ||
| 15 | import cn.iocoder.yudao.module.bpm.enums.definition.*; | 16 | import cn.iocoder.yudao.module.bpm.enums.definition.*; |
| 16 | import cn.iocoder.yudao.module.bpm.enums.task.BpmCommentTypeEnum; | 17 | import cn.iocoder.yudao.module.bpm.enums.task.BpmCommentTypeEnum; |
| 17 | import cn.iocoder.yudao.module.bpm.enums.task.BpmReasonEnum; | 18 | import cn.iocoder.yudao.module.bpm.enums.task.BpmReasonEnum; |
| @@ -20,6 +21,7 @@ import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum; | @@ -20,6 +21,7 @@ import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum; | ||
| 20 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnVariableConstants; | 21 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnVariableConstants; |
| 21 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils; | 22 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils; |
| 22 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils; | 23 | import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils; |
| 24 | +import cn.iocoder.yudao.module.bpm.service.definition.BpmFormService; | ||
| 23 | import cn.iocoder.yudao.module.bpm.service.definition.BpmModelService; | 25 | import cn.iocoder.yudao.module.bpm.service.definition.BpmModelService; |
| 24 | import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService; | 26 | import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService; |
| 25 | import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService; | 27 | import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService; |
| @@ -91,6 +93,8 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -91,6 +93,8 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 91 | private BpmModelService modelService; | 93 | private BpmModelService modelService; |
| 92 | @Resource | 94 | @Resource |
| 93 | private BpmMessageService messageService; | 95 | private BpmMessageService messageService; |
| 96 | + @Resource | ||
| 97 | + private BpmFormService formService; | ||
| 94 | 98 | ||
| 95 | @Resource | 99 | @Resource |
| 96 | private AdminUserApi adminUserApi; | 100 | private AdminUserApi adminUserApi; |
| @@ -109,6 +113,9 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -109,6 +113,9 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 109 | if (StrUtil.isNotBlank(pageVO.getName())) { | 113 | if (StrUtil.isNotBlank(pageVO.getName())) { |
| 110 | taskQuery.taskNameLike("%" + pageVO.getName() + "%"); | 114 | taskQuery.taskNameLike("%" + pageVO.getName() + "%"); |
| 111 | } | 115 | } |
| 116 | + if (StrUtil.isNotEmpty(pageVO.getCategory())) { | ||
| 117 | + taskQuery.taskCategory(pageVO.getCategory()); | ||
| 118 | + } | ||
| 112 | if (ArrayUtil.isNotEmpty(pageVO.getCreateTime())) { | 119 | if (ArrayUtil.isNotEmpty(pageVO.getCreateTime())) { |
| 113 | taskQuery.taskCreatedAfter(DateUtils.of(pageVO.getCreateTime()[0])); | 120 | taskQuery.taskCreatedAfter(DateUtils.of(pageVO.getCreateTime()[0])); |
| 114 | taskQuery.taskCreatedBefore(DateUtils.of(pageVO.getCreateTime()[1])); | 121 | taskQuery.taskCreatedBefore(DateUtils.of(pageVO.getCreateTime()[1])); |
| @@ -153,7 +160,13 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -153,7 +160,13 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 153 | BpmnModel bpmnModel = bpmProcessDefinitionService.getProcessDefinitionBpmnModel(todoTask.getProcessDefinitionId()); | 160 | BpmnModel bpmnModel = bpmProcessDefinitionService.getProcessDefinitionBpmnModel(todoTask.getProcessDefinitionId()); |
| 154 | Map<Integer, BpmTaskRespVO.OperationButtonSetting> buttonsSetting = BpmnModelUtils.parseButtonsSetting( | 161 | Map<Integer, BpmTaskRespVO.OperationButtonSetting> buttonsSetting = BpmnModelUtils.parseButtonsSetting( |
| 155 | bpmnModel, todoTask.getTaskDefinitionKey()); | 162 | bpmnModel, todoTask.getTaskDefinitionKey()); |
| 156 | - return BpmTaskConvert.INSTANCE.buildTodoTask(todoTask, childrenTasks, buttonsSetting); | 163 | + |
| 164 | + // 4. 任务表单 | ||
| 165 | + BpmFormDO taskForm = null; | ||
| 166 | + if (StrUtil.isNotBlank(todoTask.getFormKey())){ | ||
| 167 | + taskForm = formService.getForm(NumberUtils.parseLong(todoTask.getFormKey())); | ||
| 168 | + } | ||
| 169 | + return BpmTaskConvert.INSTANCE.buildTodoTask(todoTask, childrenTasks, buttonsSetting, taskForm); | ||
| 157 | } | 170 | } |
| 158 | 171 | ||
| 159 | @Override | 172 | @Override |
| @@ -188,6 +201,9 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -188,6 +201,9 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 188 | if (StrUtil.isNotBlank(pageVO.getName())) { | 201 | if (StrUtil.isNotBlank(pageVO.getName())) { |
| 189 | taskQuery.taskNameLike("%" + pageVO.getName() + "%"); | 202 | taskQuery.taskNameLike("%" + pageVO.getName() + "%"); |
| 190 | } | 203 | } |
| 204 | + if (StrUtil.isNotEmpty(pageVO.getCategory())) { | ||
| 205 | + taskQuery.taskCategory(pageVO.getCategory()); | ||
| 206 | + } | ||
| 191 | if (ArrayUtil.isNotEmpty(pageVO.getCreateTime())) { | 207 | if (ArrayUtil.isNotEmpty(pageVO.getCreateTime())) { |
| 192 | taskQuery.taskCreatedAfter(DateUtils.of(pageVO.getCreateTime()[0])); | 208 | taskQuery.taskCreatedAfter(DateUtils.of(pageVO.getCreateTime()[0])); |
| 193 | taskQuery.taskCreatedBefore(DateUtils.of(pageVO.getCreateTime()[1])); | 209 | taskQuery.taskCreatedBefore(DateUtils.of(pageVO.getCreateTime()[1])); |
| @@ -441,7 +457,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -441,7 +457,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 441 | * 判断指定用户,是否是当前任务的加签人 | 457 | * 判断指定用户,是否是当前任务的加签人 |
| 442 | * | 458 | * |
| 443 | * @param userId 用户 Id | 459 | * @param userId 用户 Id |
| 444 | - * @param task 任务 | 460 | + * @param task 任务 |
| 445 | * @return 是否 | 461 | * @return 是否 |
| 446 | */ | 462 | */ |
| 447 | private boolean isAddSignUserTask(Long userId, Task task) { | 463 | private boolean isAddSignUserTask(Long userId, Task task) { |
| @@ -669,7 +685,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -669,7 +685,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 669 | reqVO.getTargetTaskDefinitionKey(), task.getProcessDefinitionId()); | 685 | reqVO.getTargetTaskDefinitionKey(), task.getProcessDefinitionId()); |
| 670 | 686 | ||
| 671 | // 2. 调用 Flowable 框架的退回逻辑 | 687 | // 2. 调用 Flowable 框架的退回逻辑 |
| 672 | - returnTask(task, targetElement, reqVO); | 688 | + returnTask(userId, task, targetElement, reqVO); |
| 673 | } | 689 | } |
| 674 | 690 | ||
| 675 | /** | 691 | /** |
| @@ -701,11 +717,12 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -701,11 +717,12 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 701 | /** | 717 | /** |
| 702 | * 执行退回逻辑 | 718 | * 执行退回逻辑 |
| 703 | * | 719 | * |
| 720 | + * @param userId 用户编号 | ||
| 704 | * @param currentTask 当前退回的任务 | 721 | * @param currentTask 当前退回的任务 |
| 705 | * @param targetElement 需要退回到的目标任务 | 722 | * @param targetElement 需要退回到的目标任务 |
| 706 | * @param reqVO 前端参数封装 | 723 | * @param reqVO 前端参数封装 |
| 707 | */ | 724 | */ |
| 708 | - public void returnTask(Task currentTask, FlowElement targetElement, BpmTaskReturnReqVO reqVO) { | 725 | + public void returnTask(Long userId, Task currentTask, FlowElement targetElement, BpmTaskReturnReqVO reqVO) { |
| 709 | // 1. 获得所有需要回撤的任务 taskDefinitionKey,用于稍后的 moveActivityIdsToSingleActivityId 回撤 | 726 | // 1. 获得所有需要回撤的任务 taskDefinitionKey,用于稍后的 moveActivityIdsToSingleActivityId 回撤 |
| 710 | // 1.1 获取所有正常进行的任务节点 Key | 727 | // 1.1 获取所有正常进行的任务节点 Key |
| 711 | List<Task> taskList = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).list(); | 728 | List<Task> taskList = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).list(); |
| @@ -721,22 +738,29 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -721,22 +738,29 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 721 | if (!returnTaskKeyList.contains(task.getTaskDefinitionKey())) { | 738 | if (!returnTaskKeyList.contains(task.getTaskDefinitionKey())) { |
| 722 | return; | 739 | return; |
| 723 | } | 740 | } |
| 724 | - // 2.1 添加评论 | ||
| 725 | - taskService.addComment(task.getId(), currentTask.getProcessInstanceId(), BpmCommentTypeEnum.RETURN.getType(), | ||
| 726 | - BpmCommentTypeEnum.RETURN.formatComment(reqVO.getReason())); | ||
| 727 | - // 2.2 更新 task 状态 + 原因 | ||
| 728 | - updateTaskStatusAndReason(task.getId(), BpmTaskStatusEnum.RETURN.getStatus(), reqVO.getReason()); | 741 | + |
| 742 | + // 判断是否分配给自己任务,因为会签任务,一个节点会有多个任务 | ||
| 743 | + if (isAssignUserTask(userId, task)) { // 情况一:自己的任务,进行 RETURN 标记 | ||
| 744 | + // 2.1.1 添加评论 | ||
| 745 | + taskService.addComment(task.getId(), currentTask.getProcessInstanceId(), BpmCommentTypeEnum.RETURN.getType(), | ||
| 746 | + BpmCommentTypeEnum.RETURN.formatComment(reqVO.getReason())); | ||
| 747 | + // 2.1.2 更新 task 状态 + 原因 | ||
| 748 | + updateTaskStatusAndReason(task.getId(), BpmTaskStatusEnum.RETURN.getStatus(), reqVO.getReason()); | ||
| 749 | + } else { // 情况二:别人的任务,进行 CANCEL 标记 | ||
| 750 | + processTaskCanceled(task.getId()); | ||
| 751 | + } | ||
| 729 | }); | 752 | }); |
| 730 | 753 | ||
| 731 | // 3. 设置流程变量节点驳回标记:用于驳回到节点,不执行 BpmUserTaskAssignStartUserHandlerTypeEnum 策略。导致自动通过 | 754 | // 3. 设置流程变量节点驳回标记:用于驳回到节点,不执行 BpmUserTaskAssignStartUserHandlerTypeEnum 策略。导致自动通过 |
| 732 | runtimeService.setVariable(currentTask.getProcessInstanceId(), | 755 | runtimeService.setVariable(currentTask.getProcessInstanceId(), |
| 733 | String.format(PROCESS_INSTANCE_VARIABLE_RETURN_FLAG, reqVO.getTargetTaskDefinitionKey()), Boolean.TRUE); | 756 | String.format(PROCESS_INSTANCE_VARIABLE_RETURN_FLAG, reqVO.getTargetTaskDefinitionKey()), Boolean.TRUE); |
| 734 | - | ||
| 735 | // 4. 执行驳回 | 757 | // 4. 执行驳回 |
| 758 | + // 使用 moveExecutionsToSingleActivityId 替换 moveActivityIdsToSingleActivityId 原因: | ||
| 759 | + // 当多实例任务回退的时候有问题。相关 issue: https://github.com/flowable/flowable-engine/issues/3944 | ||
| 760 | + List<String> runExecutionIds = convertList(taskList, Task::getExecutionId); | ||
| 736 | runtimeService.createChangeActivityStateBuilder() | 761 | runtimeService.createChangeActivityStateBuilder() |
| 737 | .processInstanceId(currentTask.getProcessInstanceId()) | 762 | .processInstanceId(currentTask.getProcessInstanceId()) |
| 738 | - .moveActivityIdsToSingleActivityId(returnTaskKeyList, // 当前要跳转的节点列表( 1 或多) | ||
| 739 | - reqVO.getTargetTaskDefinitionKey()) // targetKey 跳转到的节点(1) | 763 | + .moveExecutionsToSingleActivityId(runExecutionIds, reqVO.getTargetTaskDefinitionKey()) |
| 740 | .changeState(); | 764 | .changeState(); |
| 741 | } | 765 | } |
| 742 | 766 | ||
| @@ -1021,14 +1045,22 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -1021,14 +1045,22 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 1021 | Integer assignEmptyHandlerType = BpmnModelUtils.parseAssignEmptyHandlerType(userTaskElement); | 1045 | Integer assignEmptyHandlerType = BpmnModelUtils.parseAssignEmptyHandlerType(userTaskElement); |
| 1022 | TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { | 1046 | TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { |
| 1023 | 1047 | ||
| 1048 | + /** | ||
| 1049 | + * 特殊情况:部分情况下,TransactionSynchronizationManager 注册 afterCommit 监听时,不会被调用,但是 afterCompletion 可以 | ||
| 1050 | + * 例如说:第一个 task 就是配置【自动通过】或者【自动拒绝】时 | ||
| 1051 | + * 参见 <a href="https://gitee.com/zhijiantianya/yudao-cloud/issues/IB7V7Q">issue</a> 反馈 | ||
| 1052 | + */ | ||
| 1024 | @Override | 1053 | @Override |
| 1025 | public void afterCompletion(int transactionStatus) { | 1054 | public void afterCompletion(int transactionStatus) { |
| 1026 | - // 特殊情况:部分情况下,TransactionSynchronizationManager 注册 afterCommit 监听时,不会被调用,但是 afterCompletion 可以 | ||
| 1027 | - // 例如说:第一个 task 就是配置【自动通过】或者【自动拒绝】时 | ||
| 1028 | - if (ObjectUtil.notEqual(transactionStatus, TransactionSynchronization.STATUS_COMMITTED)) { | 1055 | + // 回滚情况,直接返回 |
| 1056 | + if (ObjectUtil.equal(transactionStatus, TransactionSynchronization.STATUS_ROLLED_BACK)) { | ||
| 1057 | + return; | ||
| 1058 | + } | ||
| 1059 | + // 特殊情况:第一个 task 【自动通过】时,第二个任务设置审批人时 transactionStatus 会为 STATUS_UNKNOWN,不知道啥原因 | ||
| 1060 | + if (ObjectUtil.equal(transactionStatus, TransactionSynchronization.STATUS_UNKNOWN) | ||
| 1061 | + && getTask(task.getId()) == null) { | ||
| 1029 | return; | 1062 | return; |
| 1030 | } | 1063 | } |
| 1031 | - // TODO 芋艿:可以后续优化成 getSelf(); | ||
| 1032 | // 特殊情况一:【人工审核】审批人为空,根据配置是否要自动通过、自动拒绝 | 1064 | // 特殊情况一:【人工审核】审批人为空,根据配置是否要自动通过、自动拒绝 |
| 1033 | if (ObjectUtil.equal(approveType, BpmUserTaskApproveTypeEnum.USER.getType())) { | 1065 | if (ObjectUtil.equal(approveType, BpmUserTaskApproveTypeEnum.USER.getType())) { |
| 1034 | // 如果有审批人、或者拥有人,则说明不满足情况一,不自动通过、不自动拒绝 | 1066 | // 如果有审批人、或者拥有人,则说明不满足情况一,不自动通过、不自动拒绝 |
| @@ -1036,19 +1068,19 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -1036,19 +1068,19 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 1036 | return; | 1068 | return; |
| 1037 | } | 1069 | } |
| 1038 | if (ObjectUtil.equal(assignEmptyHandlerType, BpmUserTaskAssignEmptyHandlerTypeEnum.APPROVE.getType())) { | 1070 | if (ObjectUtil.equal(assignEmptyHandlerType, BpmUserTaskAssignEmptyHandlerTypeEnum.APPROVE.getType())) { |
| 1039 | - SpringUtil.getBean(BpmTaskService.class).approveTask(null, new BpmTaskApproveReqVO() | 1071 | + getSelf().approveTask(null, new BpmTaskApproveReqVO() |
| 1040 | .setId(task.getId()).setReason(BpmReasonEnum.ASSIGN_EMPTY_APPROVE.getReason())); | 1072 | .setId(task.getId()).setReason(BpmReasonEnum.ASSIGN_EMPTY_APPROVE.getReason())); |
| 1041 | } else if (ObjectUtil.equal(assignEmptyHandlerType, BpmUserTaskAssignEmptyHandlerTypeEnum.REJECT.getType())) { | 1073 | } else if (ObjectUtil.equal(assignEmptyHandlerType, BpmUserTaskAssignEmptyHandlerTypeEnum.REJECT.getType())) { |
| 1042 | - SpringUtil.getBean(BpmTaskService.class).rejectTask(null, new BpmTaskRejectReqVO() | 1074 | + getSelf().rejectTask(null, new BpmTaskRejectReqVO() |
| 1043 | .setId(task.getId()).setReason(BpmReasonEnum.ASSIGN_EMPTY_REJECT.getReason())); | 1075 | .setId(task.getId()).setReason(BpmReasonEnum.ASSIGN_EMPTY_REJECT.getReason())); |
| 1044 | } | 1076 | } |
| 1045 | // 特殊情况二:【自动审核】审批类型为自动通过、不通过 | 1077 | // 特殊情况二:【自动审核】审批类型为自动通过、不通过 |
| 1046 | } else { | 1078 | } else { |
| 1047 | if (ObjectUtil.equal(approveType, BpmUserTaskApproveTypeEnum.AUTO_APPROVE.getType())) { | 1079 | if (ObjectUtil.equal(approveType, BpmUserTaskApproveTypeEnum.AUTO_APPROVE.getType())) { |
| 1048 | - SpringUtil.getBean(BpmTaskService.class).approveTask(null, new BpmTaskApproveReqVO() | 1080 | + getSelf().approveTask(null, new BpmTaskApproveReqVO() |
| 1049 | .setId(task.getId()).setReason(BpmReasonEnum.APPROVE_TYPE_AUTO_APPROVE.getReason())); | 1081 | .setId(task.getId()).setReason(BpmReasonEnum.APPROVE_TYPE_AUTO_APPROVE.getReason())); |
| 1050 | } else if (ObjectUtil.equal(approveType, BpmUserTaskApproveTypeEnum.AUTO_REJECT.getType())) { | 1082 | } else if (ObjectUtil.equal(approveType, BpmUserTaskApproveTypeEnum.AUTO_REJECT.getType())) { |
| 1051 | - SpringUtil.getBean(BpmTaskService.class).rejectTask(null, new BpmTaskRejectReqVO() | 1083 | + getSelf().rejectTask(null, new BpmTaskRejectReqVO() |
| 1052 | .setId(task.getId()).setReason(BpmReasonEnum.APPROVE_TYPE_AUTO_REJECT.getReason())); | 1084 | .setId(task.getId()).setReason(BpmReasonEnum.APPROVE_TYPE_AUTO_REJECT.getReason())); |
| 1053 | } | 1085 | } |
| 1054 | } | 1086 | } |
| @@ -1087,8 +1119,22 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -1087,8 +1119,22 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 1087 | // 发送通知。在事务提交时,批量执行操作,所以直接查询会无法查询到 ProcessInstance,所以这里是通过监听事务的提交来实现。 | 1119 | // 发送通知。在事务提交时,批量执行操作,所以直接查询会无法查询到 ProcessInstance,所以这里是通过监听事务的提交来实现。 |
| 1088 | TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { | 1120 | TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { |
| 1089 | 1121 | ||
| 1122 | + /** | ||
| 1123 | + * 特殊情况:部分情况下,TransactionSynchronizationManager 注册 afterCommit 监听时,不会被调用,但是 afterCompletion 可以 | ||
| 1124 | + * 例如说:第一个 task 就是配置【自动通过】或者【自动拒绝】时 | ||
| 1125 | + * 参见 <a href="https://gitee.com/zhijiantianya/yudao-cloud/issues/IB7V7Q">issue</a> 反馈 | ||
| 1126 | + */ | ||
| 1090 | @Override | 1127 | @Override |
| 1091 | - public void afterCommit() { | 1128 | + public void afterCompletion(int transactionStatus) { |
| 1129 | + // 回滚情况,直接返回 | ||
| 1130 | + if (ObjectUtil.equal(transactionStatus, TransactionSynchronization.STATUS_ROLLED_BACK)) { | ||
| 1131 | + return; | ||
| 1132 | + } | ||
| 1133 | + // 特殊情况:第一个 task 【自动通过】时,第二个任务设置审批人时 transactionStatus 会为 STATUS_UNKNOWN,不知道啥原因 | ||
| 1134 | + if (ObjectUtil.equal(transactionStatus, TransactionSynchronization.STATUS_UNKNOWN) | ||
| 1135 | + && getTask(task.getId()) == null) { | ||
| 1136 | + return; | ||
| 1137 | + } | ||
| 1092 | if (StrUtil.isEmpty(task.getAssignee())) { | 1138 | if (StrUtil.isEmpty(task.getAssignee())) { |
| 1093 | log.error("[processTaskAssigned][taskId({}) 没有分配到负责人]", task.getId()); | 1139 | log.error("[processTaskAssigned][taskId({}) 没有分配到负责人]", task.getId()); |
| 1094 | return; | 1140 | return; |
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentRespVO.java
| 1 | package cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment; | 1 | package cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment; |
| 2 | 2 | ||
| 3 | +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; | ||
| 3 | import com.alibaba.excel.annotation.ExcelProperty; | 4 | import com.alibaba.excel.annotation.ExcelProperty; |
| 4 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 5 | import jakarta.validation.constraints.NotNull; | 6 | import jakarta.validation.constraints.NotNull; |
| @@ -11,6 +12,7 @@ import java.util.List; | @@ -11,6 +12,7 @@ import java.util.List; | ||
| 11 | 12 | ||
| 12 | @Schema(description = "管理后台 - ERP 付款单 Response VO") | 13 | @Schema(description = "管理后台 - ERP 付款单 Response VO") |
| 13 | @Data | 14 | @Data |
| 15 | +@ExcelIgnoreUnannotated | ||
| 14 | public class ErpFinancePaymentRespVO { | 16 | public class ErpFinancePaymentRespVO { |
| 15 | 17 | ||
| 16 | @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23752") | 18 | @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23752") |
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/receipt/ErpFinanceReceiptRespVO.java
| 1 | package cn.iocoder.yudao.module.erp.controller.admin.finance.vo.receipt; | 1 | package cn.iocoder.yudao.module.erp.controller.admin.finance.vo.receipt; |
| 2 | 2 | ||
| 3 | +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; | ||
| 3 | import com.alibaba.excel.annotation.ExcelProperty; | 4 | import com.alibaba.excel.annotation.ExcelProperty; |
| 4 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 5 | import jakarta.validation.constraints.NotNull; | 6 | import jakarta.validation.constraints.NotNull; |
| @@ -11,6 +12,7 @@ import java.util.List; | @@ -11,6 +12,7 @@ import java.util.List; | ||
| 11 | 12 | ||
| 12 | @Schema(description = "管理后台 - ERP 收款单 Response VO") | 13 | @Schema(description = "管理后台 - ERP 收款单 Response VO") |
| 13 | @Data | 14 | @Data |
| 15 | +@ExcelIgnoreUnannotated | ||
| 14 | public class ErpFinanceReceiptRespVO { | 16 | public class ErpFinanceReceiptRespVO { |
| 15 | 17 | ||
| 16 | @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23752") | 18 | @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23752") |