From b0f56573ea27a8798764314c72cf39e9eb0651dc Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 27 三月 2025 16:04:31 +0800
Subject: [PATCH] 综合利用率图表接口
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
index c8dd286..fde18f5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -448,7 +448,7 @@
if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
result.setMdcEfficiencyList(listDtos);
} else {
-
+
List<String> equipmentIdList = mdcEquipmentService.listEquipmentId(vo);
if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
vo.setEquipmentIdList(equipmentIdList);
@@ -1736,6 +1736,33 @@
return mdcEfficiencyReportMapper.getEfficiencyRate(equipmentId, date);
}
+ /**
+ * 鐝粍鍚勮澶囩患鍚堝埄鐢ㄧ巼
+ *
+ * @param teamEquEffVo
+ * @return
+ */
+ @Override
+ public Map<String, Object> teamEquipmentEfficiencyAnalyze(TeamEquEffVo teamEquEffVo) {
+ Map<String, Object> result = new HashMap<>();
+ List<String> mdcProductionIds = new ArrayList<>();
+ if (StringUtils.isEmpty(teamEquEffVo.getProductionIds())) {
+ mdcProductionIds.add(teamEquEffVo.getProductionId());
+ } else {
+ mdcProductionIds.addAll(Arrays.asList(teamEquEffVo.getProductionIds().split(",")));
+ }
+ List<String> allProductionIds = mdcProductionService.findChildren(mdcProductionIds);
+ List<MdcEquipment> equipmentList = mdcEquipmentService.findByProductionIds(allProductionIds);
+ if (equipmentList != null && !equipmentList.isEmpty()) {
+ List<String> equipmentIdList = equipmentList.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
+ List<TeamEquipmentEfficiencyAnalyzeDto> dataList = mdcEfficiencyReportMapper.teamEquipmentEfficiencyAnalyze(equipmentIdList, teamEquEffVo.getMonth());
+ result.put("dataList", dataList);
+ List<String> equipmentNameList = dataList.stream().map(TeamEquipmentEfficiencyAnalyzeDto::getEquipmentName).collect(Collectors.toList());
+ result.put("equipmentNameList", equipmentNameList);
+ }
+ return result;
+ }
+
private MdcUtilizationResultDto utilizationRate(String equipmentId, String equipmentName, String equipmentType, Date startTime, Date endTime, String date, List<MdcUtilizationRate> mdcUtilizationRateList) {
MdcUtilizationResultDto dto = new MdcUtilizationResultDto();
dto.setEquipmentId(equipmentId);
--
Gitblit v1.9.3