From 2e115e40718ae24c0b2c5f23ec4bfc4c447c3c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?= <1726150332@qq.com>
Date: Wed, 17 Sep 2025 16:41:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=97=B6=E9=97=B4=E6=99=9A=E4=B8=8E=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=AA=8C=E8=AF=81=EF=BC=8C=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=80=BB=E8=BE=91=E4=BF=AE=E6=AD=A32?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/device/domain/EquRepairWorkOrder.java  | 1 +
 .../java/com/op/device/service/impl/DevicePDAServiceImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java
index aaa69884d..606faf0f2 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java
@@ -51,6 +51,7 @@ public class EquRepairWorkOrder extends BaseEntity {
     private String workFaultDesc;
 
     private String orderDesc;//故障描述
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "报修时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;//报修时间
 
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 ea1c90909..12ddffb0a 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
@@ -1574,7 +1574,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
     public AjaxResult updateWorkCostTime() {
         //查询
         EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder();
-        equRepairWorkOrder.setWorkCostTime("-");
+//        equRepairWorkOrder.setWorkCostTime("-");
         List<EquRepairWorkOrder> list = equRepairWorkOrderMapper.selectEquRepairWorkOrderList(equRepairWorkOrder);
         int i ;
         int sum =0;