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/impl/EmergencyDrillExecuteInfoServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 b7c5a9e..1627f7e 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
@@ -89,14 +89,14 @@
}
@Override
- public String getLastTimeByDeptIds(List<Long> deptIdList) {
+ public List<EmergencyDrillExecuteLastTimeDO> getLastTimeByDeptIds(List<Long> deptIdList) {
if(null == deptIdList || deptIdList.size() == 0){
throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL);
}
return baseMapper.getLastTimeByDeptIds(deptIdList);
}
@Override
- public String getLastTimeByDeptIdsAndTime(List<Long> deptIdList,String startTime,String endTime) {
+ public List<EmergencyDrillExecuteLastTimeDO> getLastTimeByDeptIdsAndTime(List<Long> deptIdList,String startTime,String endTime) {
if(null == deptIdList || deptIdList.size() == 0 || StringUtils.isBlank(startTime) || StringUtils.isBlank(endTime)){
throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL);
}
@@ -104,6 +104,14 @@
}
@Override
+ public String getLastTimeByDeptIdAndTime(Long deptId, String startTime, String endTime) {
+ if(null == deptId || StringUtils.isBlank(startTime) || StringUtils.isBlank(endTime)){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL);
+ }
+ return baseMapper.getLastTimeByDeptIdAndTime(deptId,startTime,endTime);
+ }
+
+ @Override
public List<EmergencyExecuteCountDO> getCountByDeptIdsAndTime(String startTime, String endTime, List<Long> deptIds) {
if(null == deptIds || StringUtils.isBlank(startTime) || StringUtils.isBlank(endTime) || deptIds.size() == 0){
throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL);
--
Gitblit v1.9.2