lius
2023-07-03 2b3d1af6c4d6a66c9df7c3a1796da084b4a09331
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -72,7 +72,9 @@
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
            }
        }
        vo.setEquipmentIdList(equipmentIds);
        if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
            vo.setEquipmentIdList(equipmentIds);
        }
        // 查询利用率数据
        List<MdcEfficiencyDto> efficiencyList = mdcEfficiencyReportMapper.efficiencyList(vo);
@@ -93,16 +95,21 @@
            for (String date : dates) {
                list.add(this.efficiencyRate(efficiencyList, date, mdcEquipment, mdcUtilizationRateList));
            }
            mdcEfficiencyListDto.setList(list);
            mdcEfficiencyListDto.setDataList(list);
            listDtos.add(mdcEfficiencyListDto);
        }
        result.setLists(listDtos);
        result.setMdcEfficiencyList(listDtos);
        result.setDates(dates);
        return result;
    }
    @Override
    public MdcEfficiencyVo shiftEfficiencyList(String userId, MdcEfficiencyReportQueryVo vo) {
        return null;
    }
    private MdcEfficiencyResultDto efficiencyRate(List<MdcEfficiencyDto> efficiencyList, String date, MdcEquipment mdcEquipment, List<MdcUtilizationRate> mdcUtilizationRateList) {
        MdcEfficiencyResultDto mdcEfficiencyResultDto = new MdcEfficiencyResultDto();
        if (efficiencyList != null && !efficiencyList.isEmpty()) {