From cd02923a7ce1ffa004b3abbb7af67ab6173dd99d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期一, 25 三月 2024 10:59:40 +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/controller/EmergencyCountController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
index 7573261..bd0dd04 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
@@ -91,7 +91,7 @@
* 根据部门以及子级部门查询最后一次完成应急演练的时间
*/
@RequestMapping(value = "/getLastTimeByDeptIds",method = RequestMethod.POST)
- public EmergencyExecuteTimeRespDTO getLastTimeByDeptIds(@RequestBody JSONObject jsonObject){
+ public List<EmergencyExecuteDepLevelLasTimeRespDTO> getLastTimeByDeptIds(@RequestBody JSONObject jsonObject){
Long deptId = jsonObject.getLong("deptId");
return emergencyCountService.getLastTimeByDeptIds(deptId);
}
@@ -107,7 +107,7 @@
* 根据部门以及子级部门，年份月份，查询最后一次完成应急演练的时间
*/
@RequestMapping(value = "/getLastTimeByDeptIdsAndTime",method = RequestMethod.POST)
- public EmergencyExecuteLastTimeRespDTO getLastTimeByDeptIdsAndTime(@RequestBody EmergencyDrillTimeQuery query){
+ public List<EmergencyExecuteDepLevelLasTimeRespDTO> getLastTimeByDeptIdsAndTime(@RequestBody EmergencyDrillTimeQuery query){
return emergencyCountService.getLastPracticeTimeByDeptIdsAndTime(query);
}
--
Gitblit v1.9.2