| | |
| | | inTransitMap.merge(fb.getTaskId(), fbQty, BigDecimal::add); |
| | | } |
| | | } |
| | | |
| | | // 查询指派报工人员 |
| | | Set<Long> taskIds = convertSet(list, MesProTaskDO::getId); |
| | | Map<Long, List<cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskAssigneeDO>> assigneeMap = taskService.getTaskAssigneeMap(taskIds); |
| | | Set<Long> allAssigneeUserIds = new HashSet<>(); |
| | | assigneeMap.values().forEach(assignees -> |
| | | assignees.forEach(assignee -> allAssigneeUserIds.add(assignee.getUserId()))); |
| | | Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(allAssigneeUserIds); |
| | | |
| | | // 拼接 VO |
| | | return convertList(list, task -> { |
| | | MesProTaskRespVO vo = BeanUtils.toBean(task, MesProTaskRespVO.class); |
| | |
| | | findAndThen(processCheckMap, task.getProcessId(), vo::setCheckFlag)); |
| | | findAndThen(routeProcessBackflushFlagMap, task.getRouteId(), processBackflushMap -> |
| | | findAndThen(processBackflushMap, task.getProcessId(), vo::setBackflushFlag)); |
| | | |
| | | // 设置指派报工人员 |
| | | List<cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskAssigneeDO> assignees = assigneeMap.get(task.getId()); |
| | | if (CollUtil.isNotEmpty(assignees)) { |
| | | List<Long> assigneeUserIds = convertList(assignees, cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskAssigneeDO::getUserId); |
| | | vo.setAssigneeUserIds(assigneeUserIds); |
| | | List<String> assigneeUserNames = new ArrayList<>(); |
| | | for (Long userId : assigneeUserIds) { |
| | | AdminUserRespDTO user = userMap.get(userId); |
| | | if (user != null && user.getNickname() != null) { |
| | | assigneeUserNames.add(user.getNickname()); |
| | | } |
| | | } |
| | | vo.setAssigneeUserNames(String.join(",", assigneeUserNames)); |
| | | } |
| | | |
| | | return vo; |
| | | }); |
| | | } |