From d603739c0320f355cfc3152865918729fea790de Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 04 十一月 2024 09:45:43 +0800
Subject: [PATCH] license
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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..9bb45c8 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,9 +123,11 @@
EquipmentRateDto equipmentRateDto = new EquipmentRateDto();
equipmentRateDto.setEquipmentId(mdcEfficiencyDto.getEquipmentId());
equipmentRateDto.setEquipmentName(mdcEfficiencyDto.getEquipmentName());
- equipmentRateDto.setOpenRate(mdcEfficiencyDto.getOpenRate());
- equipmentRateDto.setUtilizationRate(mdcEfficiencyDto.getUtilizationRate());
- result.add(equipmentRateDto);
+ equipmentRateDto.setOpenRate(mdcEfficiencyDto.getOpenRate().multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP));
+ equipmentRateDto.setUtilizationRate(mdcEfficiencyDto.getUtilizationRate().multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP));
+ if (!(equipmentRateDto.getOpenRate().compareTo(BigDecimal.ZERO) == 0) && !(equipmentRateDto.getUtilizationRate().compareTo(BigDecimal.ZERO) == 0)) {
+ result.add(equipmentRateDto);
+ }
}
}
return result;
@@ -147,7 +149,9 @@
meu.setDate(new StringBuilder(mdcEfficiencyDto.getTheDate().substring(4, 8)).insert(2, "-").toString());
BigDecimal equipmentCount = mdcLargeScreenMapper.findEquipmentCount(yesterday);
meu.setUtilizationRate(mdcEfficiencyDto.getProcessLong().divide(equipmentCount.multiply(new BigDecimal("86400")), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP));
- result.add(meu);
+ if (!(meu.getUtilizationRate().compareTo(BigDecimal.ZERO) == 0)) {
+ result.add(meu);
+ }
}
}
return result;
--
Gitblit v1.9.3