From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java
index c1de4e2..6f0602d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java
@@ -52,25 +52,25 @@
List<WsEquipmentStatus> equipmentStatusList = this.baseMapper.selectEquipmentStatus();
if (equipmentStatusList != null && !equipmentStatusList.isEmpty()) {
for (WsEquipmentStatus wsEquipmentStatus : equipmentStatusList) {
- // 1-鍔犲伐 3-寰呮満 9-鍏虫満 10-鎶ヨ
+ // 1-鍔犲伐 2-寰呮満 3-鍏虫満 4-鎶ヨ
if (wsEquipmentStatus.getEquipmentStatus() != null) {
switch (wsEquipmentStatus.getEquipmentStatus()) {
case "1":
case "2":
- wsEquipmentStatus.setEquipmentStatus("3");
+ wsEquipmentStatus.setEquipmentStatus("2");
break;
case "3":
wsEquipmentStatus.setEquipmentStatus("1");
break;
case "22":
- wsEquipmentStatus.setEquipmentStatus("10");
+ wsEquipmentStatus.setEquipmentStatus("4");
break;
default:
- wsEquipmentStatus.setEquipmentStatus("9");
+ wsEquipmentStatus.setEquipmentStatus("3");
break;
}
} else {
- wsEquipmentStatus.setEquipmentStatus("9");
+ wsEquipmentStatus.setEquipmentStatus("3");
}
}
}
@@ -90,7 +90,7 @@
String equipmentRunTime = wsEquipmentUtilizationRate.getEquipmentRunTime();
wsEquipmentUtilizationRate.setStatisType("D");
wsEquipmentUtilizationRate.setEquipmentRunTime(new BigDecimal(equipmentRunTime).divide(new BigDecimal("60"), 0, RoundingMode.HALF_UP).toString());
- wsEquipmentUtilizationRate.setEquipmentRate(new BigDecimal(equipmentRunTime).divide(new BigDecimal("86400"), 2, RoundingMode.HALF_UP) + "%");
+ wsEquipmentUtilizationRate.setEquipmentRate(new BigDecimal(equipmentRunTime).divide(new BigDecimal("86400"), 2, RoundingMode.HALF_UP).toString());
wsEquipmentUtilizationRate.setEquipmentCalendar(date);
}
}
--
Gitblit v1.9.3