Compare commits

..

No commits in common. '86179dbd1d8ecdd65754b894c6b0c04373b185fa' and '25e575741bcbf965713d9f3563a2bf7cdd77a41a' have entirely different histories.

@ -813,18 +813,9 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
DecimalFormat df = new DecimalFormat("#.##"); DecimalFormat df = new DecimalFormat("#.##");
if (operationList!=null && operationList.size()>=0){ if (operationList!=null && operationList.size()>=0){
for (EquOperation operation : operationList){ for (EquOperation operation : operationList){
String operationTime = operation.getOperationTime();
//更新运行时间以及实际运行时间、故障率 //更新运行时间以及实际运行时间、故障率
equOperation.setId(operation.getId()); equOperation.setId(operation.getId());
equOperation.setOperationTime(map.get("RunTime").toString()); 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()); double result = Double.parseDouble(map.get("RunTime").toString()) - Double.parseDouble(operation.getFaultTime());
equOperation.setActualOperationTime(String.valueOf(df.format(result))); equOperation.setActualOperationTime(String.valueOf(df.format(result)));
@ -844,5 +835,14 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
return success(); return success();
} }
// @Override
// @DS("#header.poolName")
// public boolean checkWorkCodeUnique(EquRepairWorkOrder equRepairWorkOrder) {
// String code = equRepairWorkOrderMapper.checkWorkCodeUnique(equRepairWorkOrder);
// if (code == null) {
// return false;
// } else {
// return true;
// }
// }
} }

Loading…
Cancel
Save