From 08c7fcce9fa2a876412fa81a19550b77996214e2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 29 May 2023 20:18:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRuleServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRuleServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRuleServiceImpl.java
index eb6f83e..8e8284d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRuleServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRuleServiceImpl.java
@@ -23,7 +23,24 @@
* @return
*/
@Override
- public IPage<AlarmRuleVO> selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule) {
+ public Object selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule) {
+ if (null != alarmRule.getIsExport()){
+ return baseMapper.selectAlarmRulePage(null,alarmRule);
+ }
return page.setRecords(baseMapper.selectAlarmRulePage(page,alarmRule));
}
+
+ /**
+ * 通过id查询
+ * @param id
+ * @return
+ */
+ @Override
+ public AlarmRuleVO getDetail(String id) {
+ AlarmRuleVO alarmRule = baseMapper.getDetailById(id);
+ // 查询详情信息
+ alarmRule.setAlarmRuleDetailList(baseMapper.getAlarmRuleDetailList(id));
+ // 返回
+ return alarmRule;
+ }
}
--
Gitblit v1.9.3