From cf547f4d9c56cf2d86ae60132aa7496bee93bf9c Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 21 二月 2023 17:12:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/lf/server/mapper/data/MetaMapper.java |   78 +++++++++++++++++++++++++++++++--------
 1 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/lf/server/mapper/data/MetaMapper.java b/src/main/java/com/lf/server/mapper/data/MetaMapper.java
index 4703dd1..129db33 100644
--- a/src/main/java/com/lf/server/mapper/data/MetaMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/MetaMapper.java
@@ -7,7 +7,7 @@
 import java.util.List;
 
 /**
- * 鍏冩暟鎹�
+ * 婧愭暟鎹�
  * @author WWW
  */
 @Mapper
@@ -16,24 +16,48 @@
     /**
      * 鏌ヨ璁板綍鏁�
      *
-     * @param depid 鍗曚綅ID
-     * @param dirid 鐩綍ID
-     * @param name  鍚嶇О
+     * @param depcode 鍗曚綅缂栫爜
+     * @param dircode 鐩綍缂栫爜
+     * @param verid   鐗堟湰ID
+     * @param name    鍚嶇О
      * @return 璁板綍鏁�
      */
-    public Integer selectCount(Integer depid, Integer dirid, String name);
+    public Integer selectCount(String depcode, String dircode, Integer verid, String name);
 
     /**
      * 鍒嗛〉鏌ヨ
      *
-     * @param depid  鍗曚綅ID
-     * @param dirid  鐩綍ID
-     * @param name   鍚嶇О
-     * @param limit  璁板綍鏁�
-     * @param offset 鍋忕Щ閲�
+     * @param depcode 鍗曚綅缂栫爜
+     * @param dircode 鐩綍缂栫爜
+     * @param verid   鐗堟湰ID
+     * @param name    鍚嶇О
+     * @param limit   璁板綍鏁�
+     * @param offset  鍋忕Щ閲�
      * @return 鍒楄〃
      */
-    public List<MetaEntity> selectByPage(Integer depid, Integer dirid, String name, Integer limit, Integer offset);
+    public List<MetaEntity> selectByPage(String depcode, String dircode, Integer verid, String name, Integer limit, Integer offset);
+
+    /**
+     * 鏌ヨ璁板綍鏁�
+     *
+     * @param depcode
+     * @param dirs
+     * @param name
+     * @return
+     */
+    public Integer selectMetasForCount(String depcode, String dirs, String name);
+
+    /**
+     * 鍒嗛〉鏌ヨ
+     *
+     * @param depcode
+     * @param dirs
+     * @param name
+     * @param limit
+     * @param offset
+     * @return
+     */
+    public List<MetaEntity> selectMetasForPage(String depcode, String dirs, String name, Integer limit, Integer offset);
 
     /**
      * 鏌ヨ涓婁紶璁板綍鏁�
@@ -58,11 +82,24 @@
     public List<MetaEntity> selectByPageForUpload(String name, Integer createUser, String types, Integer limit, Integer offset);
 
     /**
-     * 鏌ヨ鎵�鏈�
+     * 鏍规嵁鐖禝D鏌ヨ璁板綍鏁�
      *
+     * @param metaid
+     * @param name
      * @return
      */
-    public List<MetaEntity> selectAll();
+    public Integer selectCountByPid(Integer metaid, String name);
+
+    /**
+     * 鏍规嵁鐖禝D鍒嗛〉鏌ヨ
+     *
+     * @param metaid
+     * @param name
+     * @param limit
+     * @param offset
+     * @return
+     */
+    public List<MetaEntity> selectPageByPid(Integer metaid, String name, Integer limit, Integer offset);
 
     /**
      * 鏍规嵁ID鏌ヨ
@@ -82,14 +119,23 @@
     public MetaEntity selectByGuid(String guid, String tab);
 
     /**
-     * 鏌ヨ鍏冩暟鎹枃浠�
+     * 鏌ヨ婧愭暟鎹枃浠�
      *
-     * @param ids 鍏冩暟鎹甀D闆嗗悎
-     * @return 鍏冩暟鎹枃浠堕泦鍚�
+     * @param ids 婧愭暟鎹甀D闆嗗悎
+     * @return 婧愭暟鎹枃浠堕泦鍚�
      */
     public List<MetaEntity> selectMetaFiles(List<Integer> ids);
 
     /**
+     * 鏌ヨExcel婧愭暟鎹�
+     *
+     * @param ids  婧愭暟鎹甀D闆嗗悎
+     * @param tabs 琛ㄥ悕瀛楃涓�
+     * @return 婧愭暟鎹枃浠堕泦鍚�
+     */
+    public List<MetaEntity> selectXlsAnnex(Integer[] ids, String tabs);
+
+    /**
      * 鎻掑叆涓�鏉�
      *
      * @param entity

--
Gitblit v1.9.3