diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index 12ddffb0a..e6b1b560a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -1124,8 +1124,14 @@ public class DevicePDAServiceImpl implements IDevicePDAService { if (list.getWorkStartTime() != null && equRepairWorkOrder.getWorkEndTime() != null) { ////2.1计算维修日期差值(开始时间为维修单创建时间) ZoneId zoneId = ZoneId.systemDefault(); - LocalDateTime workStart = LocalDateTime.parse(list.getCreateTime().toString()); - LocalDateTime workEnd = LocalDateTime.parse(equRepairWorkOrder.getWorkEndTime().toString()); + LocalDateTime workStart = list.getCreateTime().toInstant() + .atZone(zoneId) + .toLocalDateTime(); + // LocalDateTime workStart = LocalDateTime.parse(list.getCreateTime().toString()); + LocalDateTime workEnd = equRepairWorkOrder.getWorkEndTime().toInstant() + .atZone(zoneId) + .toLocalDateTime(); + // 核心计算方法 double workHour = calculateHourDifference(workStart, workEnd);