abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化任务办理人获取

Browse Source
This commit is contained in:
AprilWind 2024-12-04 16:43:34 +08:00
parent f3091e8742
commit 4fabd4f399
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java
View File

@ -5,6 +5,8 @@ import lombok.Data;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import static org.dromara.common.core.enums.TaskAssigneeEnum.USER;
/** /**
* 抄送 * 抄送
* *
@ -26,4 +28,8 @@ public class WfCopy implements Serializable {
*/ */
private String userName; private String userName;
public String getUserId() {
return USER.getCode() + userId;
}
} }

1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
View File

@ -168,7 +168,6 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
AssertUtil.isNull(startNode, ExceptionCons.LOST_START_NODE); AssertUtil.isNull(startNode, ExceptionCons.LOST_START_NODE);
Node nextNode = nodeService.getNextNode(definition.getId(), startNode.getNodeCode(), null, SkipType.NONE.getKey()); Node nextNode = nodeService.getNextNode(definition.getId(), startNode.getNodeCode(), null, SkipType.NONE.getKey());
FlowParams flowParams = FlowParams.build(); FlowParams flowParams = FlowParams.build();
flowParams.handler(LoginHelper.getUserIdStr());
flowParams.nodeCode(nextNode.getNodeCode()); flowParams.nodeCode(nextNode.getNodeCode());
flowParams.message(bo.getMessage()); flowParams.message(bo.getMessage());
flowParams.flowStatus(BusinessStatusEnum.CANCEL.getStatus()).hisStatus(TaskStatusEnum.CANCEL.getStatus()); flowParams.flowStatus(BusinessStatusEnum.CANCEL.getStatus()).hisStatus(TaskStatusEnum.CANCEL.getStatus());

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

@ -83,14 +83,13 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Map<String, Object> startWorkFlow(StartProcessBo startProcessBo) { public Map<String, Object> startWorkFlow(StartProcessBo startProcessBo) {
String businessKey = startProcessBo.getBusinessKey(); String businessKey = startProcessBo.getBusinessKey();
String userId = LoginHelper.getUserIdStr();
if (StringUtils.isBlank(businessKey)) { if (StringUtils.isBlank(businessKey)) {
throw new ServiceException("启动工作流时必须包含业务ID"); throw new ServiceException("启动工作流时必须包含业务ID");
} }
// 启动流程实例（提交申请） // 启动流程实例（提交申请）
Map<String, Object> variables = startProcessBo.getVariables(); Map<String, Object> variables = startProcessBo.getVariables();
// 流程发起人 // 流程发起人
variables.put(INITIATOR, userId); variables.put(INITIATOR, LoginHelper.getUserIdStr());
// 业务id // 业务id
variables.put(BUSINESS_KEY, businessKey); variables.put(BUSINESS_KEY, businessKey);
WfDefinitionConfigVo wfDefinitionConfigVo = wfDefinitionConfigService.getByTableNameLastVersion(startProcessBo.getTableName()); WfDefinitionConfigVo wfDefinitionConfigVo = wfDefinitionConfigService.getByTableNameLastVersion(startProcessBo.getTableName());
@ -135,9 +134,6 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean completeTask(CompleteTaskBo completeTaskBo) { public boolean completeTask(CompleteTaskBo completeTaskBo) {
try { try {
// 获取当前用户ID作为任务处理人
String userId = LoginHelper.getUserIdStr();
// 获取任务ID并查询对应的流程任务和实例信息 // 获取任务ID并查询对应的流程任务和实例信息
Long taskId = completeTaskBo.getTaskId(); Long taskId = completeTaskBo.getTaskId();
// 获取抄送人 // 获取抄送人
@ -228,7 +224,6 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
FlowParams flowParams = FlowParams.build(); FlowParams flowParams = FlowParams.build();
flowParams.skipType(SkipType.NONE.getKey()); flowParams.skipType(SkipType.NONE.getKey());
flowParams.hisStatus(TaskStatusEnum.COPY.getStatus()); flowParams.hisStatus(TaskStatusEnum.COPY.getStatus());
flowParams.handler(LoginHelper.getUserIdStr());
flowParams.message("【抄送给】" + StreamUtils.join(wfCopyList, WfCopy::getUserName)); flowParams.message("【抄送给】" + StreamUtils.join(wfCopyList, WfCopy::getUserName));
HisTask hisTask = hisTaskService.setSkipHisTask(task, flowNode, flowParams); HisTask hisTask = hisTaskService.setSkipHisTask(task, flowNode, flowParams);
hisTask.setCreateTime(updateTime); hisTask.setCreateTime(updateTime);
@ -239,7 +234,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
for (WfCopy wfCopy : wfCopyList) { for (WfCopy wfCopy : wfCopyList) {
FlowUser flowUser = new FlowUser(); FlowUser flowUser = new FlowUser();
flowUser.setType(String.valueOf(4)); flowUser.setType(String.valueOf(4));
flowUser.setProcessedBy(USER.getCode() + wfCopy.getUserId()); flowUser.setProcessedBy(wfCopy.getUserId());
flowUser.setAssociated(taskId); flowUser.setAssociated(taskId);
userList.add(flowUser); userList.add(flowUser);
} }