hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-02-03 12:14:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

【功能完善】工作流：审批详情 approve-nodes => activity-nodes 字段

Browse Source
This commit is contained in:
YunaiV 2024-10-27 11:23:45 +08:00
parent 50418b2519
commit 19d3f64bdf
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
import cn.iocoder.yudao.framework.common.util.number.NumberUtils; import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO; import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
@ -201,6 +202,16 @@ public interface BpmProcessInstanceConvert {
return userIds; return userIds;
} }
default Set<Long> parseUserIds02(HistoricProcessInstance processInstance,
List<HistoricTaskInstance> tasks) {
Set<Long> userIds = SetUtils.asSet(Long.valueOf(processInstance.getStartUserId()));
tasks.forEach(task -> {
CollUtil.addIfAbsent(userIds, NumberUtils.parseLong((task.getAssignee())));
CollUtil.addIfAbsent(userIds, NumberUtils.parseLong((task.getOwner())));
});
return userIds;
}
default BpmApprovalDetailRespVO buildApprovalDetail(BpmnModel bpmnModel, default BpmApprovalDetailRespVO buildApprovalDetail(BpmnModel bpmnModel,
ProcessDefinition processDefinition, ProcessDefinition processDefinition,
BpmProcessDefinitionInfoDO processDefinitionInfo, BpmProcessDefinitionInfoDO processDefinitionInfo,

2
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
View File

File diff suppressed because one or more lines are too long