From 956be52af030ba5872fe23bf8994948c0e87c3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?= <1726150332@qq.com>
Date: Thu, 9 Oct 2025 10:12:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE=E5=8D=95?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=BB=B4=E4=BF=AE=E5=8D=95=E7=94=A8=E6=97=B6?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=BF=87=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/device/service/impl/DevicePDAServiceImpl.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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);