From a8b7758ca2b0641482ff709bbee8c172b8c5d7bb Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 08 十二月 2023 17:00:01 +0800
Subject: [PATCH] 利用率报表
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessCountDto.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 12 +++++++++++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyVo.java | 3 +++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessCountDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessCountDto.java
index 076b602..c319b29 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessCountDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessCountDto.java
@@ -11,7 +11,7 @@
private String equipmentId;
private String equipmentName;
private String driveType;
- private String theData;
+ private String theDate;
private String sequenceNumber;
private Long duration;
private Integer processCount;
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 94e7a96..6a44ed3 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
@@ -109,7 +109,7 @@
List<MdcEfficiencyDto> efficiencyList = mdcEfficiencyReportMapper.efficiencyList(vo);
// 鍒╃敤鐜囩瓑绾�
List<MdcUtilizationRate> mdcUtilizationRateList = mdcUtilizationRateService.listByType("lyl");
-
+ result.setUtilizationRateList(mdcUtilizationRateList);
// 灏佽缁撴灉
if ("2".equals(vo.getTypeTree())) {
// 閮ㄩ棬灞傜骇
@@ -239,6 +239,16 @@
result.setMdcEfficiencyList(listDtos);
}
+/* // 娣诲姞鍚堣鍊煎拰骞冲潎鍊�
+ result.getDates().add("骞冲潎鍊�");
+ MdcEfficiencyListDto sum = new MdcEfficiencyListDto();
+ sum.setLevel1("鍚堣鍊�");
+ sum.setLevel2("鍚堣鍊�");
+ sum.setLevel3("鍚堣鍊�");
+ sum.setEquipmentId("鍚堣鍊�");
+ sum.setEquipmentName("鍚堣鍊�");
+ sum.setEquipmentType("鍚堣鍊�");
+ result.getMdcEfficiencyList().add(sum);*/
return result;
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyVo.java
index cee9a2a..cf3e4de 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyVo.java
@@ -2,6 +2,7 @@
import lombok.Data;
import org.jeecg.modules.mdc.dto.MdcEfficiencyListDto;
+import org.jeecg.modules.mdc.entity.MdcUtilizationRate;
import java.util.List;
@@ -18,4 +19,6 @@
private List<MdcEfficiencyListDto> mdcEfficiencyList;
private List<String> dates;
+
+ private List<MdcUtilizationRate> utilizationRateList;
}
--
Gitblit v1.9.3