| | |
| | | return String.valueOf(item.getId()); |
| | | }).collect(Collectors.toList())); |
| | | } |
| | | List<WorkstationVO> workstationVOS = this.workstationMapper.listPage(workStationGroupIdList, workstationVOIPage, keyWord, groupId, CommonGroupConstant.ALL_WORKSTATION_ID, status == null ? CommonConstant.ENABLE : status, type, LocalDate.now().getYear()); |
| | | List<WorkstationVO> workstationVOS = this.workstationMapper.listPage(workStationGroupIdList, workstationVOIPage, keyWord, groupId, CommonGroupConstant.ALL_WORKSTATION_ID, status, type, LocalDate.now().getYear()); |
| | | workstationVOS.forEach(workstationVO -> { |
| | | String calendarName = workstationVO.getCalendarName(); |
| | | if (Func.isBlank(calendarName)) { |
| | |
| | | @Override |
| | | @Transactional(rollbackFor = {Exception.class}) |
| | | public Boolean deleteGroup(Long groupId) { |
| | | commonGroupOfItemService.lambdaUpdate().set(CommonGroupOfItem::getGroupId,CommonGroupConstant.DEFAULT_GROUP_ID) |
| | | .eq(CommonGroupOfItem::getGroupId, groupId).update(); |
| | | |
| | | if (this.commonGroupOfItemService.count(Lambda.eq(CommonGroupOfItem::getGroupId, groupId)) > 0) { |
| | | throw new ServiceException(MessageUtils.message("cps.common.group.production.line.delete.fail", new Object[0])); |
| | | } |
| | |
| | | @Override |
| | | public IPage<WorkstationRealTimeStatusVO> getRealTimeStatus(WorkstationRealTimeStatusDTO dto, Query query) { |
| | | List<String> workStationGroupIdList = dto.getWorkStationGroupIdList(); |
| | | if (workStationGroupIdList.size() == 1) { |
| | | if (workStationGroupIdList !=null && workStationGroupIdList.size() == 1) { |
| | | List<String> workStationGroupIdByParentList = getCommonGroupIds(workStationGroupIdList, new ArrayList<>()).stream().map(item -> { |
| | | return String.valueOf(item.getId()); |
| | | }).collect(Collectors.toList()); |
| | |
| | | |
| | | @Override |
| | | public IPage<Workstation> listWorkStationOnShiftIndex(List<String> ids, LocalDate localDate, Query query, Integer shift, Integer type) { |
| | | return ((WorkstationMapper) this.baseMapper).listWorkStationOnShiftIndex(Condition.getPage(query), Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate), shift, type, ids); |
| | | return this.baseMapper.listWorkStationOnShiftIndex(Condition.getPage(query), localDate.getYear(), DateUtil.formatDate(localDate), shift, type, ids); |
| | | } |
| | | |
| | | @Override |
| | |
| | | if (Func.isEmpty(i.getMachineId())) { |
| | | filter = false; |
| | | } |
| | | |
| | | List<RealTimeStatusVO> properties = realTimePropertiesMap.get(i.getId()); |
| | | if (Func.isNotEmpty(deviceStatus)) { |
| | | if (Func.isEmpty(properties)) { |