From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: Wed, 21 Sep 2022 14:40:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/EquipmentInfoService.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/EquipmentInfoService.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/EquipmentInfoService.java
index 2a36794..3bc94e4 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/EquipmentInfoService.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/EquipmentInfoService.java
@@ -7,9 +7,13 @@
import com.gkhy.safePlatform.equipment.model.dto.req.EquipmentInfoQueryCriteria;
import com.gkhy.safePlatform.equipment.model.dto.req.EquipmentInfoSaveOrUpdate;
import com.gkhy.safePlatform.equipment.model.dto.resp.EquipmentInfoDto;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
import java.io.Serializable;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
@@ -18,7 +22,7 @@
* @author xurui
* @since 2022-07-19 14:02:50
*/
-public interface EquipmentInfoService extends IService<EquipmentInfo> {
+public interface EquipmentInfoService {
ResultVO queryAll(PageQuery<EquipmentInfoQueryCriteria> pageQuery);
List<EquipmentInfo> queryAll(EquipmentInfoQueryCriteria criteria);
@@ -28,4 +32,14 @@
void addOrUpdate(EquipmentInfoSaveOrUpdate infoDto);
Object statistics();
+
+ Map<Long,String> getDepName(Set<Long> collectDepIdSet);
+
+ void importData(MultipartFile file) throws IOException;
+
+ void delete(Long[] ids);
+
+ void exportTemplate() throws IOException;
+
+ void exportData(EquipmentInfoQueryCriteria queryCriteria) throws IOException;
}
\ No newline at end of file
--
Gitblit v1.9.2