From 0aa00cd0593e363a88c152ce07734dd738513603 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期六, 12 十月 2024 10:56:38 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java | 4 ++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java
index 144d282..76d8f2a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java
@@ -123,8 +123,8 @@
EquipmentRateDto equipmentRateDto = new EquipmentRateDto();
equipmentRateDto.setEquipmentId(mdcEfficiencyDto.getEquipmentId());
equipmentRateDto.setEquipmentName(mdcEfficiencyDto.getEquipmentName());
- equipmentRateDto.setOpenRate(mdcEfficiencyDto.getOpenRate());
- equipmentRateDto.setUtilizationRate(mdcEfficiencyDto.getUtilizationRate());
+ equipmentRateDto.setOpenRate(mdcEfficiencyDto.getOpenRate().setScale(2, RoundingMode.HALF_UP));
+ equipmentRateDto.setUtilizationRate(mdcEfficiencyDto.getUtilizationRate().setScale(2, RoundingMode.HALF_UP));
result.add(equipmentRateDto);
}
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java
index a9bc963..1e18d1b 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java
@@ -111,12 +111,12 @@
*/
@Override
public List<ToolLifeDto> toolLifeList(String productionId) {
- List<ToolLifeDto> toolLifeList = mdcSubLargeScreenMapper.toolLifeList(productionId);
- if (toolLifeList != null && !toolLifeList.isEmpty()) {
- for (ToolLifeDto toolLifeDto : toolLifeList) {
- toolLifeDto.setTId("T" + toolLifeDto.getTId());
- }
- }
- return toolLifeList;
+// List<ToolLifeDto> toolLifeList = mdcSubLargeScreenMapper.toolLifeList(productionId);
+// if (toolLifeList != null && !toolLifeList.isEmpty()) {
+// for (ToolLifeDto toolLifeDto : toolLifeList) {
+// toolLifeDto.setTId("T" + toolLifeDto.getTId());
+// }
+// }
+ return mdcSubLargeScreenMapper.toolLifeList(productionId);
}
}
--
Gitblit v1.9.3