From f9a9fb9090c2e9e1a4e00374d48181efe2463a56 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 09 五月 2025 11:10:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java
index be8d111..efbad37 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java
@@ -325,13 +325,13 @@
}
@Override
- public MdcEquipmentStatisticalInfo findByEquipmentAndDate(List<String> equipmentList, String date) {
- return this.baseMapper.findByEquipmentAndDate(equipmentList, date);
+ public List<MdcEquipmentStatisticalInfo> findByEquipmentAndDate(List<String> equipmentList, String start, String end) {
+ return this.baseMapper.findByEquipmentAndDate(equipmentList, start, end);
}
@Override
- public MdcEquipmentStatisticalInfo findByEquIdAndDate(String equipmentId, String date) {
- return this.baseMapper.findByEquIdAndDate(equipmentId, date);
+ public List<MdcEquipmentStatisticalInfo> findByEquIdAndDate(String equipmentId, String start, String end) {
+ return this.baseMapper.findByEquIdAndDate(equipmentId, start, end);
}
@Override
--
Gitblit v1.9.3