From a05ff34856120a3f52aa0f43bf17cd74efbd3e08 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Fri, 8 Dec 2023 18:05:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=A3=80=E6=9F=A5=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/device/service/impl/DevicePDAServiceImpl.java | 3 ++- .../java/com/op/device/service/impl/EquOrderServiceImpl.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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 4041c241..77e4a4af 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 @@ -272,11 +272,12 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equOrder.setUpdateTime(DateUtils.getNowDate()); equOrder.setUpdateBy(SecurityContextHolder.getUserName()); equOrder.setPlanPerson(SecurityContextHolder.getUserName());// 设置负责人 + equOrder.setOrderEnd(DateUtils.getNowDate());// 设置检查时间结束 + equOrder.setOrderStart(DateUtils.getNowDate());// 设置检查时间开始 if (equOrder.getTimeArray().size() > 0) { equOrder.setOrderStart(equOrder.getTimeArray().get(0));// 工单开始时间 equOrder.setOrderEnd(equOrder.getTimeArray().get(1));// 工单结束时间 } - equOrder.setOrderStart(DateUtils.getNowDate());// 设置检查时间 // 是否存在报修单 boolean checkRepair = false; diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java index 2801ed74..02b69d0e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java @@ -269,6 +269,7 @@ public class EquOrderServiceImpl implements IEquOrderService { equOrder.setUpdateTime(DateUtils.getNowDate()); equOrder.setUpdateBy(SecurityContextHolder.getUserName()); equOrder.setPlanPerson(SecurityContextHolder.getUserName());// 设置负责人 + equOrder.setOrderEnd(DateUtils.getNowDate());// 设置结束时间 if (equOrder.getTimeArray().size() > 0) { equOrder.setOrderStart(equOrder.getTimeArray().get(0));// 工单开始时间 equOrder.setOrderEnd(equOrder.getTimeArray().get(1));// 工单结束时间