wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 处理加签或转交的事件问题

Browse Source
This commit is contained in:
wangli 2023-12-09 21:14:43 +08:00
parent 7ad2c0090f
commit b2ac834a9f
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
View File

@ -590,6 +590,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
.filter(i -> Objects.equals(COMMENT_TYPE_OPERATION_COUNTERSIGN, i.getType())).findFirst(); .filter(i -> Objects.equals(COMMENT_TYPE_OPERATION_COUNTERSIGN, i.getType())).findFirst();
operation.ifPresent(i -> { operation.ifPresent(i -> {
vo.setOperationDesc(i.getFullMessage()); vo.setOperationDesc(i.getFullMessage());
vo.setEndTime(i.getTime());
vo.setResult(COUNTERSIGN); vo.setResult(COUNTERSIGN);
}); });
@ -599,6 +600,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
.filter(i -> Objects.equals(COMMENT_TYPE_OPERATION_TRANSFER, i.getType())).findFirst(); .filter(i -> Objects.equals(COMMENT_TYPE_OPERATION_TRANSFER, i.getType())).findFirst();
transfer.ifPresent(i -> { transfer.ifPresent(i -> {
vo.setOperationDesc(i.getFullMessage()); vo.setOperationDesc(i.getFullMessage());
vo.setEndTime(i.getTime());
vo.setResult(TRANSFER); vo.setResult(TRANSFER);
}); });
@ -718,14 +720,13 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
((TaskEntity) task).setScopeType("TRANSFER"); ((TaskEntity) task).setScopeType("TRANSFER");
taskService.saveTask(task); taskService.saveTask(task);
Authentication.setAuthenticatedUserId(dto.getOriginAssigner().buildAssigneeId());
taskService.addComment(task.getId(), task.getProcessInstanceId(), COMMENT_TYPE_OPERATION_TRANSFER, taskService.addComment(task.getId(), task.getProcessInstanceId(), COMMENT_TYPE_OPERATION_TRANSFER,
"转交给 " + dto.getTargetAssigner().getAssignerName()); "转交给 " + dto.getTargetAssigner().getAssignerName());
if (StringUtils.hasLength(dto.getAdvice())) { if (StringUtils.hasLength(dto.getAdvice())) {
Authentication.setAuthenticatedUserId(dto.getOriginAssigner().buildAssigneeId());
taskService.addComment(dto.getTaskId(), task.getProcessInstanceId(), COMMENT_TYPE_ADVICE, dto.getAdvice()); taskService.addComment(dto.getTaskId(), task.getProcessInstanceId(), COMMENT_TYPE_ADVICE, dto.getAdvice());
Authentication.setAuthenticatedUserId(null);
} }
Authentication.setAuthenticatedUserId(null);
List<BpmnTaskDelegateAssigner> originAssingeeList = runtimeService.getVariable(task.getProcessInstanceId(), List<BpmnTaskDelegateAssigner> originAssingeeList = runtimeService.getVariable(task.getProcessInstanceId(),
INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT + task.getTaskDefinitionKey(), List.class); INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT + task.getTaskDefinitionKey(), List.class);

14
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/SnapshotBpmnTaskTaskEventListener.java
View File

@ -4,12 +4,9 @@ import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
import cn.axzo.workflow.core.listener.BpmnTaskEventListener; import cn.axzo.workflow.core.listener.BpmnTaskEventListener;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.RuntimeService; import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.impl.util.CommandContextUtil;
import org.flowable.task.service.delegate.DelegateTask; import org.flowable.task.service.delegate.DelegateTask;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
@ -40,17 +37,6 @@ public class SnapshotBpmnTaskTaskEventListener implements BpmnTaskEventListener,
List<BpmnTaskDelegateAssigner> assignerList = runtimeService.getVariable(delegateTask.getProcessInstanceId(), List<BpmnTaskDelegateAssigner> assignerList = runtimeService.getVariable(delegateTask.getProcessInstanceId(),
INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT + delegateTask.getTaskDefinitionKey(), INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT + delegateTask.getTaskDefinitionKey(),
List.class); List.class);
if (CollectionUtils.isEmpty(assignerList)) {
// 加签
TaskService taskService = CommandContextUtil.getProcessEngineConfiguration().getTaskService();
BpmnTaskDelegateAssigner assigner = taskService.getVariable(delegateTask.getId(),
INTERNAL_TASK_RELATION_ASSIGNEE_INFO, BpmnTaskDelegateAssigner.class);
if (Objects.isNull(assigner)) {
return;
} else {
assignerList.add(assigner);
}
}
// identityId_identityType // identityId_identityType
assignerList.stream().filter(i -> Objects.equals(delegateTask.getAssignee(), i.buildAssigneeId())).findFirst().ifPresent(i -> { assignerList.stream().filter(i -> Objects.equals(delegateTask.getAssignee(), i.buildAssigneeId())).findFirst().ifPresent(i -> {
// 保存每个 taskId 的审批人 // 保存每个 taskId 的审批人