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/repository/EmergencyDrillExecuteInfoRepository.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java index 6acfa28..35b5ee0 100644 --- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java @@ -2,13 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteCountChart; -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.query.EmergencyDrillExecuteRPCQuery; +import com.gkhy.safePlatform.emergency.entity.*; import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteDBQuery; -import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteRPCDBQuery; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -31,7 +26,13 @@ Integer selectEmergencyDrillExecuteIntervalTime(); - List<EmergencyDrillExecuteCountChart> selectByMouthTimeAndType(@Param("query")EmergencyDrillExecuteRPCDBQuery dbQuery); + List<EmergencyDrillExecuteCountData> selectByMonthAndDept(@Param("startTime") String startTime ,@Param("endTime")String endTime ,@Param("deptIds")List<Long> deptIds); - List<EmergencyDrillExecuteCountChart> selectByYearTimeAndType(@Param("query")EmergencyDrillExecuteRPCDBQuery dbQuery); + List<EmergencyDrillExecuteCountData> selectByYearAndDept(@Param("startTime") String startTime ,@Param("endTime")String endTime ,@Param("deptIds")List<Long> deptIds); + + List<EmergencyDrillExecuteCountRPC> selectByDayAndDept(@Param("startTime") String startTime ,@Param("endTime")String endTime ,@Param("deptIds")List<Long> deptIds); + + List<EmergencyDrillExecuteCountRPC> selectByMonthAndDeptForIntegerMonth(@Param("startTime") String startTime ,@Param("endTime")String endTime ,@Param("deptIds")List<Long> deptIds); + + String selectEmergencyDrillExecuteIntervalTimeByDeptId(@Param("deptId")Long deptId); } -- Gitblit v1.9.2