From f1e088fbd984c8ca1a59e3757328c4d4aa36c9d0 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 17 十月 2023 16:45:07 +0800
Subject: [PATCH] 35
---
src/main/java/com/whyc/util/SubTablePageInfoUtils.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/util/SubTablePageInfoUtils.java b/src/main/java/com/whyc/util/SubTablePageInfoUtils.java
index adaca38..28a9e92 100644
--- a/src/main/java/com/whyc/util/SubTablePageInfoUtils.java
+++ b/src/main/java/com/whyc/util/SubTablePageInfoUtils.java
@@ -184,7 +184,8 @@
data.setLimitStart(limitList.get(0));
data.setLimitEnd(limitList.get(1));
data.setRecordYear(recordYear);
- List<AlarmRes> list = battAlarmDataHistoryMapper.getList2(data);
+ //List<AlarmRes> list = battAlarmDataHistoryMapper.getList2(data);
+ List<AlarmRes> list = subService.getList2(data);
dataList.addAll(list);
}
else if (pojo instanceof DevAlarmPar) {
@@ -430,7 +431,8 @@
data.setLimitStart(limitList.get(0));
data.setLimitEnd(limitList.get(1));
data.setRecordYear(recordYear);
- List<AlarmRes> list = battAlarmDataHistoryMapper.getList2(data);
+ //List<AlarmRes> list = battAlarmDataHistoryMapper.getList2(data);
+ List<AlarmRes> list = subService.getList2(data);
dataList.addAll(list);
}
else if (pojo instanceof DevAlarmPar) {
--
Gitblit v1.9.1