设备完好率运行时间优化

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;
-//        }
-//    }
+
 }