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

update - 调整 mock 选人的数据

Browse Source
This commit is contained in:
wangli 2023-11-29 19:55:37 +08:00
parent 3744938a29
commit badf74b9a3
5 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyEnum.java
View File

@ -14,6 +14,7 @@ public enum ApproverSpecifyEnum {
initiatorLeader("initiatorLeader", "发起人主管"),
initiatorLeaderRecursion("initiatorLeaderRecursion", "发起人多级主管"),
fixedPerson("fixedPerson", "固定人员"),
preNodeSpecified("preNodeSpecified", "上级节点指定"),
;
private String type;
private String desc;

5
workflow-engine-core/src/main/java/cn/axzo/workflow/core/deletage/MockTaskAssigneeSelector.java
View File

@ -28,9 +28,10 @@ public class MockTaskAssigneeSelector implements BpmnTaskAssigneeSelector {
// 一级审批
if (Objects.equals(userTask.getId(), "2")) {
BpmnTaskDelegateAssigner task_2 = new BpmnTaskDelegateAssigner();
task_2.setAssignee("1");
task_2.setAssignee("24");
task_2.setAssigneeType("5");
task_2.setAssignerName("王粒");
task_2.setTenantId("10001");
task_2.setTenantId("296");
users.add(task_2);
}

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

@ -311,7 +311,8 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
taskService.addComment(dto.getTaskId(), instance.getId(), COMMENT_TYPE_ADVICE, dto.getAdvice());
}
if (Objects.nonNull(dto.getNextApprover())) {
runtimeService.setVariable(task.getExecutionId(), INTERNAL_SPECIFY_NEXT_APPROVER, dto.getNextApprover());
runtimeService.setVariable(task.getProcessInstanceId(), INTERNAL_SPECIFY_NEXT_APPROVER,
dto.getNextApprover());
}
saveAttachment(dto.getAttachmentList(), instance.getId(), task.getId());

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/FixedPersonTaskAssigneeSelector.java
View File

@ -12,7 +12,7 @@ import java.util.ArrayList;
import java.util.List;
/**
* 基于"固定人元"查询审批人
* 基于"固定人员"查询审批人
*
* @author wangli
* @since 2023/11/18 22:56

41
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/PreNodeSpecifiedTaskAssigneeSelector.java Normal file
View File

@ -0,0 +1,41 @@
package cn.axzo.workflow.server.controller.delegate;
import cn.axzo.workflow.common.enums.ApproverSpecifyEnum;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
import com.google.common.collect.Lists;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.model.UserTask;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.delegate.DelegateExecution;
import org.springframework.stereotype.Component;
import java.util.List;
import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_SPECIFY_NEXT_APPROVER;
/**
* 上级节点指定审批人
*
* @author wangli
* @since 2023/11/29 17:43
*/
@Slf4j
@Component
@AllArgsConstructor
public class PreNodeSpecifiedTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
private final RuntimeService runtimeService;
@Override
public boolean support(String param) {
return ApproverSpecifyEnum.preNodeSpecified.getType().equals(param);
}
@Override
public List<BpmnTaskDelegateAssigner> select(UserTask userTask, DelegateExecution execution) {
BpmnTaskDelegateAssigner assigner = runtimeService.getVariable(execution.getProcessInstanceId(),
INTERNAL_SPECIFY_NEXT_APPROVER, BpmnTaskDelegateAssigner.class);
return Lists.newArrayList(assigner);
}
}