lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
@@ -71,6 +71,10 @@ } if (mdcDeviceCalendarQueryVo.getEquipmentIdList() == null || mdcDeviceCalendarQueryVo.getEquipmentIdList().isEmpty()) { mdcDeviceCalendarQueryVo.setEquipmentIdList(equipmentIds); } if (mdcDeviceCalendarQueryVo.getEquipmentIdList() == null || mdcDeviceCalendarQueryVo.getEquipmentIdList().isEmpty()) { return null; } return this.baseMapper.pageList(pageData, mdcDeviceCalendarQueryVo); lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -76,6 +76,12 @@ vo.setEquipmentIdList(equipmentIds); } List<String> dates = DateUtils.getDatesStringList2(DateUtils.getShortDate2(vo.getStartTime()), DateUtils.getShortDate2(vo.getEndTime())); result.setDates(dates); if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) { result.setMdcEfficiencyList(listDtos); } else { // 查询利用率数据 List<MdcEfficiencyDto> efficiencyList = mdcEfficiencyReportMapper.efficiencyList(vo); // 利用率等级 @@ -83,8 +89,6 @@ //封装结果 List<MdcEquipment> equipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList())); List<String> dates = DateUtils.getDatesStringList2(DateUtils.getShortDate2(vo.getStartTime()), DateUtils.getShortDate2(vo.getEndTime())); for (MdcEquipment mdcEquipment : equipmentList) { MdcEfficiencyListDto mdcEfficiencyListDto = new MdcEfficiencyListDto(); @@ -100,7 +104,7 @@ } result.setMdcEfficiencyList(listDtos); result.setDates(dates); } return result; } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java
@@ -160,6 +160,10 @@ repair.setMdcSectionIds(equipmentIds); } if (repair.getMdcSectionIds() == null || repair.getMdcSectionIds().isEmpty()) { return null; } return this.baseMapper.pageList(page, repair); }