From 8702c17288c16ec3d6760326e85cae37bbb10af8 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期三, 17 八月 2022 16:07:17 +0800 Subject: [PATCH] 事故fix统计 --- emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 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 a7f75a6..1430965 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 @@ -4,9 +4,9 @@ import com.gkhy.safePlatform.commons.utils.PageUtils; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteCountRespDTO; -import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecutePageRespDTO; -import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteQuery; +import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesCountRespDTO; import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery; +import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery; import com.gkhy.safePlatform.emergency.service.EmergencyCountService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -28,16 +28,13 @@ return emergencyCountService.countEmergencyDrillExecute(query); } -/* *//** + /** * 应急物资统计图 - *//* + */ @RequestMapping(value = "/emergencySupplies/count" ,method = RequestMethod.POST) - private ResultVO<List<EmergencyDrillExecutePageRespDTO>> list (@RequestBody PageQuery<EmergencyDrillExecuteQuery> pageQuery){ + private ResultVO<List<EmergencySuppliesCountRespDTO>> list (@RequestBody PageQuery<EmergencySuppliesCountQuery> pageQuery){ PageUtils.checkCheck(pageQuery); - return emergencyDrillExecuteService.selectEmergencyDrillExecuteList(pageQuery); - }*/ - - - + return emergencyCountService.countEmergencySupplies(pageQuery); + } } -- Gitblit v1.9.2