|
|
@ -1137,15 +1137,12 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
|
|
|
|
} else if (list.getFaultStartTime() != null) {
|
|
|
|
} else if (list.getFaultStartTime() != null) {
|
|
|
|
downStartTime = list.getFaultStartTime();
|
|
|
|
downStartTime = list.getFaultStartTime();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
LocalDateTime downStart = LocalDateTime.ofInstant(downStartTime.toInstant(), zoneId);
|
|
|
|
|
|
|
|
LocalDateTime downEnd = LocalDateTime.ofInstant(equRepairWorkOrder.getWorkEndTime().toInstant(), zoneId);
|
|
|
|
|
|
|
|
LocalDateTime downDateTime = LocalDateTime.from(downStart);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
double downHours = downDateTime.until(downEnd, ChronoUnit.HOURS);
|
|
|
|
Date workEndTime = equRepairWorkOrder.getWorkEndTime();
|
|
|
|
double downMinutes = ((downDateTime.until(downEnd, ChronoUnit.MINUTES) * 1.0) % 60) / 60;
|
|
|
|
double diff = BigDecimal.valueOf((workEndTime.getTime() - downStartTime.getTime()))
|
|
|
|
double downSeconds = ((downDateTime.until(downEnd, ChronoUnit.SECONDS) * 1.0) % 3600) / 3600;
|
|
|
|
.divide(BigDecimal.valueOf(3600000), 2, RoundingMode.HALF_UP)
|
|
|
|
double downHour = BigDecimal.valueOf(downHours + downMinutes + downSeconds).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
|
|
|
|
.doubleValue();
|
|
|
|
equRepairWorkOrder.setFaultDownTime(String.valueOf(downHour) + "小时");
|
|
|
|
equRepairWorkOrder.setFaultDownTime(diff + "小时");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//代码注释掉了 改了流程 之前是维修完成后,更改设备状态 和 设备运行报表 现在是审核通过之后,才会扣除
|
|
|
|
//代码注释掉了 改了流程 之前是维修完成后,更改设备状态 和 设备运行报表 现在是审核通过之后,才会扣除
|
|
|
|