From 428ca1646e9c2a45a62d41ddf27be8d2330b2ab1 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, 13 Aug 2025 09:48:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=AE=8C=E5=A5=BD=E7=8E=87?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E9=97=B4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EquRepairWorkOrderServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java index d5a162ab9..b8e3d2f4a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java @@ -813,9 +813,18 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService DecimalFormat df = new DecimalFormat("#.##"); if (operationList!=null && operationList.size()>=0){ for (EquOperation operation : operationList){ + String operationTime = operation.getOperationTime(); //更新运行时间以及实际运行时间、故障率 equOperation.setId(operation.getId()); equOperation.setOperationTime(map.get("RunTime").toString()); + if (operationTime!=null && operationTime != ""){ + String RunTime = map.get("RunTime").toString(); + equOperation.setOperationTime(map.get("RunTime").toString()); + double num = Double.parseDouble(RunTime); + double numk = Double.parseDouble(operationTime); + double sum = num + numk; + equOperation.setOperationTime(String.format("%.2f", sum)); + } //实际运行时间 = 实际运行时间 - 故障时间 double result = Double.parseDouble(map.get("RunTime").toString()) - Double.parseDouble(operation.getFaultTime()); equOperation.setActualOperationTime(String.valueOf(df.format(result))); @@ -835,14 +844,5 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService return success(); } -// @Override -// @DS("#header.poolName") -// public boolean checkWorkCodeUnique(EquRepairWorkOrder equRepairWorkOrder) { -// String code = equRepairWorkOrderMapper.checkWorkCodeUnique(equRepairWorkOrder); -// if (code == null) { -// return false; -// } else { -// return true; -// } -// } + }