From c633a2b7f6d91a6bbd72940dd7a004f49b01b6be Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期五, 30 六月 2023 16:05:51 +0800
Subject: [PATCH] 利用率报表接口
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 4 ++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyListDto.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyVo.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyListDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyListDto.java
index ceea58a..09ae327 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyListDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyListDto.java
@@ -28,5 +28,5 @@
/**
* 鍒╃敤鐜囨暟鎹�
*/
- private List<MdcEfficiencyResultDto> list;
+ private List<MdcEfficiencyResultDto> dataList;
}
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 c0857ab..fff89eb 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
@@ -93,11 +93,11 @@
for (String date : dates) {
list.add(this.efficiencyRate(efficiencyList, date, mdcEquipment, mdcUtilizationRateList));
}
- mdcEfficiencyListDto.setList(list);
+ mdcEfficiencyListDto.setDataList(list);
listDtos.add(mdcEfficiencyListDto);
}
- result.setLists(listDtos);
+ result.setMdcEfficiencyList(listDtos);
result.setDates(dates);
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 214c7ca..c03970b 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
@@ -15,7 +15,7 @@
/**
* 鍒╃敤鐜囨暟鎹�
*/
- private List<MdcEfficiencyListDto> lists;
+ private List<MdcEfficiencyListDto> mdcEfficiencyList;
// /**
// * 鍒╃敤鐜囨暟鎹�
--
Gitblit v1.9.3