From 759bbb8ee99665382a689fa90277a9b2279238da Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 19 Aug 2022 19:04:02 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java
index 9cf4515..9f48ac1 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java
@@ -2,13 +2,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteCountChart;
+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.query.EmergencyDrillExecuteRPCQuery;
import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteDBQuery;
-import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteRPCDBQuery;
import com.gkhy.safePlatform.emergency.repository.EmergencyDrillExecuteInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillExecuteInfoService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -58,14 +56,13 @@
}
@Override
- public List<EmergencyDrillExecuteCountChart> selectByMouthTimeAndType(EmergencyDrillExecuteRPCDBQuery dbQuery) {
- return emergencyDrillExecuteInfoRepository.selectByMouthTimeAndType(dbQuery);
+ public List<EmergencyDrillExecuteCountData> selectByMonthAndDept(String startTime ,String endTime ,List<Long> deptIds) {
+ return emergencyDrillExecuteInfoRepository.selectByMonthAndDept(startTime,endTime,deptIds);
}
@Override
- public List<EmergencyDrillExecuteCountChart> selectByYearTimeAndType(EmergencyDrillExecuteRPCDBQuery dbQuery) {
- return emergencyDrillExecuteInfoRepository.selectByYearTimeAndType(dbQuery);
+ public List<EmergencyDrillExecuteCountData> selectByYearAndDept(String startTime ,String endTime ,List<Long> deptIds) {
+ return emergencyDrillExecuteInfoRepository.selectByYearAndDept(startTime,endTime,deptIds);
}
-
}
--
Gitblit v1.9.2