From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
index 8343697..4216884 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
@@ -18,6 +18,8 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springblade.jfpt.catalog.entitly.catalog;
+import org.springblade.jfpt.catalog.vo.catalogVO;
+import org.springblade.system.vo.DeptVO;
 
 import java.util.List;
 import java.util.Map;
@@ -33,7 +35,13 @@
 	List<Map<String, Object>> selectCount();
 	List<Map<String, Object>> selectAddvcd();
 	List<Map<String, Object>> selectEq();
-	List<Map<String, Object>> selectWar();
+	List<Map<String, Object>> selectWar(String beginTime,String endTime);
 
-	List selectCatalogEqNUmber(String pid);
+	List<Map<String, Object>> selectCatalogEqNUmber(String id);
+
+	List<catalogVO> lazyTree(String tenantId, Long parentId);
+	void updateCatalog(String name, String eqid,String pid);
+	void addCatalog(String name, String eqid,String pid);
+
+	List<catalogVO> tree();
 }

--
Gitblit v1.9.3