From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java b/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
index c815a24..69cf2f8 100644
--- a/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
+++ b/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
@@ -4,8 +4,8 @@
import com.lf.server.entity.ctrl.KeyValueEntity;
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.DictEntity;
-import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.data.DomainEntity;
+import com.lf.server.entity.sys.AttachEntity;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@@ -35,29 +35,27 @@
public List<IdNameEntity> selectDepFuzzy(String name);
/**
- * 鏌ヨ鎵�鏈夎〃
- *
- * @return
- */
- public List<TabEntity> selectTabs();
-
- /**
* 鏍规嵁琛ㄥ悕鏌ヨ璁板綍鏁�
*
- * @param tab 琛ㄥ悕
- * @return 璁板綍鏁�
+ * @param tab 琛ㄥ悕
+ * @param typesFilter 绫诲埆
+ * @param field 瀛楁
+ * @return
*/
- public Integer selectTabsForCount(String tab);
+ public Integer selectTabsForCount(String tab, String typesFilter, String field);
/**
* 鏍规嵁琛ㄥ悕鍒嗛〉鏌ヨ
*
- * @param tab 琛ㄥ悕
- * @param limit 璁板綍鏁�
- * @param offset 鍋忕Щ閲�
+ * @param tab 琛ㄥ悕
+ * @param typesFilter 绫诲埆
+ * @param field 瀛楁
+ * @param filters 杩囨护鏉′欢
+ * @param limit 璁板綍鏁�
+ * @param offset 鍋忕Щ閲�
* @return
*/
- public List<TabEntity> selectTabsByPage(String tab, Integer limit, Integer offset);
+ public List<TabEntity> selectTabsByPage(String tab, String typesFilter, String field, String filters, Integer limit, Integer offset);
/**
* 鏌ヨ瀛楁淇℃伅
@@ -97,9 +95,28 @@
public List<KeyValueEntity> selectLocation(String wkt);
/**
- * 鏌ヨ鍩虹鍦扮悊绫诲埆
+ * 鏌ヨ鐩綍绫诲埆
*
+ * @param name
* @return
*/
- public List<DirEntity> selectBaseType();
+ public List<KeyValueEntity> selectDirTypes(String name);
+
+ /**
+ * 鏍规嵁璧勬枡绫诲埆鏌ヨ鐩綍
+ *
+ * @param types
+ * @param dirs
+ * @return
+ */
+ public List<KeyValueEntity> selectDirsByTypes(String[] types, String dirs);
+
+ /**
+ * 鏍规嵁琛ㄥ悕鏌ヨ闄勪欢
+ *
+ * @param tab 琛ㄥ悕
+ * @param gids Gid瀛楃涓�
+ * @return 闄勪欢
+ */
+ public List<AttachEntity> selectAnnexByTab(String tab, String gids);
}
--
Gitblit v1.9.3