wangrunpu
/
stm32-iot-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 优化 工作流后台发起或审批可以手动设置办理人

Browse Source
master
疯狂的狮子Li 5 months ago
parent b97f711eb4
commit 2b0dd82d3d
7 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File

5
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java
Unescape View File

@ -50,6 +50,11 @@ public class CompleteTaskDTO implements Serializable {
*/
private String notice;
/**
* 办理人(可不填 用于覆盖当前节点办理人)
*/
private String handler;
/**
* 流程变量
*/

5
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java
Unescape View File

@ -30,6 +30,11 @@ public class StartProcessDTO implements Serializable {
*/
private String flowCode;
/**
* 办理人(可不填 用于覆盖当前节点办理人)
*/
private String handler;
/**
* 流程变量，前端会提交一个元素{'entity': {业务详情数据对象}}
*/

5
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java
Unescape View File

@ -53,6 +53,11 @@ public class CompleteTaskBo implements Serializable {
*/
private String notice;
/**
* 办理人(可不填 用于覆盖当前节点办理人)
*/
private String handler;
/**
* 流程变量
*/

5
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java
Unescape View File

@ -34,6 +34,11 @@ public class StartProcessBo implements Serializable {
@NotBlank(message = "流程定义编码不能为空", groups = {AddGroup.class})
private String flowCode;
/**
* 办理人(可不填 用于覆盖当前节点办理人)
*/
private String handler;
/**
* 流程变量，前端会提交一个元素{'entity': {业务详情数据对象}}
*/

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
Unescape View File

@ -126,6 +126,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
variables.put(FlowConstant.AUTO_PASS, autoPass);
FlowParams flowParams = FlowParams.build()
.handler(startProcessBo.getHandler())
.flowCode(startProcessBo.getFlowCode())
.variable(startProcessBo.getVariables())
.flowStatus(BusinessStatusEnum.DRAFT.getStatus());
@ -186,6 +187,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
}
// 构建流程参数，包括变量、跳转类型、消息、处理人、权限等信息
FlowParams flowParams = FlowParams.build()
.handler(completeTaskBo.getHandler())
.variable(variables)
.skipType(SkipType.PASS.getKey())
.message(completeTaskBo.getMessage())

16
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
Unescape View File

@ -9,12 +9,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.dto.CompleteTaskDTO;
import org.dromara.common.core.domain.dto.StartProcessDTO;
import org.dromara.common.core.domain.dto.StartProcessReturnDTO;
import org.dromara.common.core.domain.event.ProcessTaskEvent;
import org.dromara.common.core.domain.event.ProcessDeleteEvent;
import org.dromara.common.core.domain.event.ProcessEvent;
import org.dromara.common.core.domain.event.ProcessTaskEvent;
import org.dromara.common.core.enums.BusinessStatusEnum;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.service.WorkflowService;
@ -132,12 +130,14 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
// 后端发起需要忽略权限
bo.getParams().put("ignore", true);
StartProcessDTO startProcess = new StartProcessDTO();
startProcess.setBusinessId(leave.getId().toString());
startProcess.setFlowCode(StringUtils.isEmpty(bo.getFlowCode()) ? "leave1" : bo.getFlowCode());
startProcess.setVariables(bo.getParams());
// 后端发起 如果没有登录用户 比如定时任务 可以手动设置一个处理人id
// startProcess.setHandler("0");
boolean flag1 = workflowService.startCompleteTask(new StartProcessDTO() {{
setBusinessId(leave.getId().toString());
setFlowCode(StringUtils.isEmpty(bo.getFlowCode()) ? "leave1" : bo.getFlowCode());
setVariables(bo.getParams());
}});
boolean flag1 = workflowService.startCompleteTask(startProcess);
if (!flag1) {
throw new ServiceException("流程发起异常");
}

24
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java
Unescape View File

@ -161,16 +161,20 @@ public class WorkflowServiceImpl implements WorkflowService {
@Transactional(rollbackFor = Exception.class)
public boolean startCompleteTask(StartProcessDTO startProcess) {
try {
StartProcessReturnDTO result = flwTaskService.startWorkFlow(new StartProcessBo() {{
setBusinessId(startProcess.getBusinessId());
setFlowCode(startProcess.getFlowCode());
setVariables(startProcess.getVariables());
}});
boolean flag = flwTaskService.completeTask(new CompleteTaskBo() {{
setTaskId(result.getTaskId());
setMessageType(Collections.singletonList(MessageTypeEnum.SYSTEM_MESSAGE.getCode()));
setVariables(startProcess.getVariables());
}});
StartProcessBo processBo = new StartProcessBo();
processBo.setBusinessId(startProcess.getBusinessId());
processBo.setFlowCode(startProcess.getFlowCode());
processBo.setVariables(startProcess.getVariables());
processBo.setHandler(startProcess.getHandler());
StartProcessReturnDTO result = flwTaskService.startWorkFlow(processBo);
CompleteTaskBo taskBo = new CompleteTaskBo();
taskBo.setTaskId(result.getTaskId());
taskBo.setMessageType(Collections.singletonList(MessageTypeEnum.SYSTEM_MESSAGE.getCode()));
taskBo.setVariables(startProcess.getVariables());
taskBo.setHandler(startProcess.getHandler());
boolean flag = flwTaskService.completeTask(taskBo);
if (!flag) {
throw new ServiceException("流程发起异常");
}

Write Preview
Loading…
Cancel
Save