|
@@ -974,7 +974,8 @@ public class ApsServiceImpl implements ApsService {
|
|
|
for (ApsEquipmentCalendarDo equipmentCalendarDo : equipmentCalendarDos) {
|
|
|
EquipmentRunTime er = new EquipmentRunTime();
|
|
|
er.setStartRunTime(equipmentCalendarDo.getSdstarttime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
|
|
|
- if(equipmentCalendarDo.getSdendtime() != null){
|
|
|
+ // 结束时间如果大于2099年,则认为空,没有停机结束时间
|
|
|
+ if(equipmentCalendarDo.getSdendtime() != null && equipmentCalendarDo.getSdendtime().compareTo(DateUtil.parseDateTime("2099-01-01 00:00:00)"))<0){
|
|
|
er.setEndRunTime(equipmentCalendarDo.getSdendtime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
|
|
|
}
|
|
|
er.setOccupyType("maintenance");
|