From 9a73660fa673120de8fb4fdacdfe2a9f47fe9fbb Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期二, 08 十一月 2022 08:38:10 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java
index 6169166..06ea050 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java
@@ -28,8 +28,21 @@
List<EmergencyDrillExecuteCountData> selectByYearAndDept(String startTime ,String endTime ,List<Long> deptIds);
- List<EmergencyDrillExecuteCountData> selectByDayAndDept(String startTime, String endTime, List<Long> deptIds);
+ List<EmergencyDrillExecuteCountRPC> selectByDayAndDept(String startTime, String endTime, List<Long> deptIds);
+
+ List<EmergencyDrillExecuteCountRPC> selectByMonthAndDeptForIntegerMonth(String startTime, String endTime, List<Long> deptIds);
String selectEmergencyDrillExecuteIntervalTimeByDeptId(Long deptId);
+ String getLastTimeByDeptId(Long deptId);
+
+ List<EmergencyDrillExecuteLastTimeDO> getLastTimeByDeptIds(List<Long> deptIdList);
+
+ List<EmergencyExecuteCountDO> getCountByDeptIdsAndTime(String startTime, String endTime, List<Long> deptId);
+ EmergencyExecuteCountDO getCountByDeptIdAndMonth(Integer year,Integer month, Long deptId);
+
+ List<EmergencyExecuteCountDO> getCountByDeptIdAndYear(Integer year, Long deptId);
+ List<EmergencyDrillExecuteLastTimeDO> getLastTimeByDeptIdsAndTime(List<Long> deptIdList,String startTime,String endTime);
+
+ String getLastTimeByDeptIdAndTime(Long deptId, String startTime, String endTime);
}
--
Gitblit v1.9.2