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/EmergencySuppliesService.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesService.java
index 4463d16..bf6d411 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesService.java
@@ -1,11 +1,14 @@
 package com.gkhy.safePlatform.emergency.service;
 
+import com.gkhy.safePlatform.commons.co.ContextCacheUser;
 import com.gkhy.safePlatform.commons.query.PageQuery;
 import com.gkhy.safePlatform.commons.vo.ResultVO;
 import com.gkhy.safePlatform.commons.vo.SearchResultVO;
 import com.gkhy.safePlatform.emergency.model.dto.req.EmergencySuppliesReqDTO;
 import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesDetailRespDTO;
 import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesPageRespDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesRespDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesTypeRespDTO;
 import com.gkhy.safePlatform.emergency.query.EmergencySuppliesQuery;
 
 import java.util.List;
@@ -21,4 +24,11 @@
     ResultVO updateEmergencySupplies(Long uid, EmergencySuppliesReqDTO emergencySuppliesReqDTO);
 
     ResultVO batchDeleteEmergencySupplies( Long[]  ids);
+
+    /**
+     * 应急物资-列表(为特殊作业提供数据)
+     */
+    List<EmergencySuppliesTypeRespDTO> emergencySuppliesList(ContextCacheUser currentUser);
+
+    List<EmergencySuppliesRespDTO> listCountByIds(ContextCacheUser currentUser, List<Long> ids);
 }

--
Gitblit v1.9.2