From f1f506172a3edff8d31e4db77b8940f115660919 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期二, 20 九月 2022 16:25:43 +0800 Subject: [PATCH] fix --- emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 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 2ff3ce5..ffd722f 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 @@ -2,12 +2,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteCountData; -import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo; -import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfoDetailDO; -import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfoPageDO; +import com.gkhy.safePlatform.emergency.entity.*; import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteDBQuery; -import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteRPCDBQuery; import java.util.List; @@ -28,7 +24,14 @@ Integer selectEmergencyDrillExecuteIntervalTime(); - List<EmergencyDrillExecuteCountData> selectByMouthTimeAndType(EmergencyDrillExecuteRPCDBQuery dbQuery); + List<EmergencyDrillExecuteCountData> selectByMonthAndDept(String startTime ,String endTime ,List<Long> deptIds); - List<EmergencyDrillExecuteCountData> selectByYearTimeAndType(EmergencyDrillExecuteRPCDBQuery dbQuery); + List<EmergencyDrillExecuteCountData> selectByYearAndDept(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); + } -- Gitblit v1.9.2