From e5afbe8d4feccaf34bce709402ed9eb0b4ef9159 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 27 Jun 2021 22:57:17 +0800
Subject: [PATCH] 1.设备统计代码同步修改 2.考勤模糊查询代码同步修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
index bdb5ad0..b8453e0 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
@@ -183,7 +183,7 @@
}
@Override
- public List<Map<String, Object>> getAlarming(AlarmVO alarmVO) {
+ public List<AlarmVO> getAlarming(AlarmVO alarmVO) {
return baseMapper.getAlarming(alarmVO);
}
@@ -410,4 +410,14 @@
public List<ReportReturnData> getAlarmPie(AlarmVO alarmVO) {
return baseMapper.getAlarmPie(alarmVO);
}
+
+ /**
+ * 查询未处理及处理中的警情总数量
+ * @param deviceNumber 设备编号
+ * @return
+ */
+ @Override
+ public Integer selectEqCount(String deviceNumber) {
+ return baseMapper.selectEqCount(deviceNumber);
+ }
}
--
Gitblit v1.9.3