| | |
|---|
| | | List<MdcOeeInfo> oeeList = this.baseMapper.oeeList(vo); |
|---|
| | | //数据处理 |
|---|
| | | String shiftSubName = "全部"; |
|---|
| | | if (!StringUtils.isBlank(vo.getShiftId())) { |
|---|
| | | List<MdcShiftSub> mdcShiftSubList = new ArrayList<>(); |
|---|
| | | if (StringUtils.isNotBlank(vo.getShiftSubId())) { |
|---|
| | | mdcShiftSubList = mdcShiftSubService.list(new LambdaQueryWrapper<MdcShiftSub>().eq(MdcShiftSub::getId, vo.getShiftSubId()).eq(MdcShiftSub::getShiftSubStatus, "1")); |
|---|
| | | oeeList = oeeList.stream().filter(mdcOeeInfo -> mdcOeeInfo.getShiftId().equals(vo.getShiftId()) && mdcOeeInfo.getShiftSubId().equals(vo.getShiftSubId())).collect(Collectors.toList()); |
|---|
| | | } else { |
|---|
| | | mdcShiftSubList = mdcShiftSubService.list(new LambdaQueryWrapper<MdcShiftSub>().eq(MdcShiftSub::getShiftId, vo.getShiftId()).eq(MdcShiftSub::getShiftSubStatus, "1")); |
|---|
| | | oeeList = oeeList.stream().filter(mdcOeeInfo -> mdcOeeInfo.getShiftId().equals(vo.getShiftId())).collect(Collectors.toList()); |
|---|
| | | } |
|---|
| | | List<MdcShiftSub> mdcShiftSubList = new ArrayList<>(); |
|---|
| | | if (StringUtils.isNotBlank(vo.getShiftSubId())) { |
|---|
| | | mdcShiftSubList = mdcShiftSubService.list(new LambdaQueryWrapper<MdcShiftSub>().eq(MdcShiftSub::getId, vo.getShiftSubId()).eq(MdcShiftSub::getShiftSubStatus, "1")); |
|---|
| | | //oeeList = oeeList.stream().filter(mdcOeeInfo -> mdcOeeInfo.getShiftId().equals(vo.getShiftId()) && mdcOeeInfo.getShiftSubId().equals(vo.getShiftSubId())).collect(Collectors.toList()); |
|---|
| | | List<String> shiftSubNames = mdcShiftSubList.stream().map(MdcShiftSub::getShiftSubName).collect(Collectors.toList()); |
|---|
| | | shiftSubName = String.join(",", shiftSubNames); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | for (MdcEquipment mdcEquipment : equipmentList) { |
|---|
| | | MdcOeeListDto mdcOeeListDto = new MdcOeeListDto(); |
|---|
| | | mdcOeeListDto.setEquipmentId(mdcEquipment.getEquipmentId()); |
|---|
