From a1207db1240b85b660b380d766098215806ceda2 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 22 八月 2024 15:50:28 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 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 e107ae2..31e82b7 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
@@ -1,5 +1,6 @@
package org.jeecg.modules.screen.service.impl;
+import org.jeecg.modules.mdc.dto.MdcEfficiencyDto;
import org.jeecg.modules.mdc.service.IMdcEquipmentStatisticalInfoService;
import org.jeecg.modules.mdcJc.entity.MdcProductDayschedule;
import org.jeecg.modules.mdcJc.service.IMdcProductDayScheduleService;
@@ -28,7 +29,7 @@
@Resource
private MdcLargeScreenMapper mdcLargeScreenMapper;
- private final String yesterday = LocalDate.now().plusDays(-1).toString();
+ private final String yesterday = LocalDate.now().plusDays(-1).toString().replaceAll("-", "");
private final String today = LocalDate.now().toString();
@@ -83,7 +84,9 @@
for (MdcProductDayschedule mdcProductDayschedule : list) {
TodayProductionPassRateDto todayProductionPassRateDto = new TodayProductionPassRateDto();
todayProductionPassRateDto.setProductionName(mdcProductDayschedule.getProductName());
- todayProductionPassRateDto.setPassRate(new BigDecimal(mdcProductDayschedule.getQualifiedCount()).divide(new BigDecimal(mdcProductDayschedule.getCompletionCount()), 0, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP));
+ if (mdcProductDayschedule.getCompletionCount() != 0) {
+ todayProductionPassRateDto.setPassRate(new BigDecimal(mdcProductDayschedule.getQualifiedCount()).divide(new BigDecimal(mdcProductDayschedule.getCompletionCount()), 0, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP));
+ }
result.add(todayProductionPassRateDto);
}
}
@@ -107,7 +110,18 @@
*/
@Override
public List<EquipmentRateDto> todayEquipmentRate() {
- return null;
-// return mdcLargeScreenMapper.todayEquipmentRate();
+ List<EquipmentRateDto> result = new ArrayList<>();
+ List<MdcEfficiencyDto> mdcEfficiencyDtoList = mdcLargeScreenMapper.efficiencyList(yesterday);
+ if (mdcEfficiencyDtoList != null && !mdcEfficiencyDtoList.isEmpty()) {
+ for (MdcEfficiencyDto mdcEfficiencyDto : mdcEfficiencyDtoList) {
+ EquipmentRateDto equipmentRateDto = new EquipmentRateDto();
+ equipmentRateDto.setEquipmentId(mdcEfficiencyDto.getEquipmentId());
+ equipmentRateDto.setEquipmentName(mdcEfficiencyDto.getEquipmentName());
+ equipmentRateDto.setOpenRate(mdcEfficiencyDto.getOpenRate());
+ equipmentRateDto.setUtilizationRate(mdcEfficiencyDto.getUtilizationRate());
+ result.add(equipmentRateDto);
+ }
+ }
+ return result;
}
}
--
Gitblit v1.9.3