diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index 0b86e25..bf8dfb7 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -260,7 +260,7 @@ public class ScheduleServiceImpl implements ScheduleService { //查询数据 List> resultList = scheduleMapper.countSfdcTimeQty(inData); //判断是否查询到结果数据 - if (resultList.size() > 0) { + if (resultList.size() > 0 && resultList.isEmpty() ) { result = resultList.get(0); //处理时间的数据 //处理调机 @@ -314,6 +314,15 @@ public class ScheduleServiceImpl implements ScheduleService { result.put("totalPureManufactureTime", totalPureManufactureTime); result.put("code", "200"); } else { + result.put("totalSetupTime", 0); + result.put("totalDowntimeTimeSetup", 0); + result.put("totalPureSetupTime", 0); + result.put("totalProdTime", 0); + result.put("totalDowntimeTimeProd", 0); + result.put("totalPureProdTime", 0); + result.put("totalManufactureTime", 0); + result.put("totalManufactureDowntimeTime", 0); + result.put("totalPureManufactureTime", 0); result.put("code", "500"); } return result;