From a644c4bb75b173d14fad9ed7dc7cf85c41d4953a Mon Sep 17 00:00:00 2001 From: Administrator <admin> Date: Tue, 02 Mar 2021 23:12:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java | 9 +++++++-- 1 files changed, 7 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..0c2c6a1 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,10 @@ 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(); + + List<catalogVO> lazyTree(String tenantId, Long parentId); + void updateCatalog(String name, String eqid); } -- Gitblit v1.9.3