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 | 90 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 73 insertions(+), 17 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 a3bed32..129db33 100644 --- a/src/main/java/com/lf/server/mapper/data/MetaMapper.java +++ b/src/main/java/com/lf/server/mapper/data/MetaMapper.java @@ -1,14 +1,13 @@ package com.lf.server.mapper.data; import com.lf.server.entity.data.MetaEntity; -import com.lf.server.entity.data.MetaFileEntity; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; import java.util.List; /** - * 鍏冩暟鎹� + * 婧愭暟鎹� * @author WWW */ @Mapper @@ -17,22 +16,48 @@ /** * 鏌ヨ璁板綍鏁� * - * @param dirid 鐩綍ID - * @param name 鍚嶇О + * @param depcode 鍗曚綅缂栫爜 + * @param dircode 鐩綍缂栫爜 + * @param verid 鐗堟湰ID + * @param name 鍚嶇О * @return 璁板綍鏁� */ - public Integer selectCount(Integer dirid, String name); + public Integer selectCount(String depcode, String dircode, Integer verid, String name); /** * 鍒嗛〉鏌ヨ * - * @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 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); /** * 鏌ヨ涓婁紶璁板綍鏁� @@ -50,18 +75,31 @@ * @param name 鍚嶇О * @param createUser 鐢ㄦ埛ID * @param types 鏂囦欢绫诲瀷 - * @param limit 璁板綍琛� + * @param limit 璁板綍鏁� * @param offset 鍋忕Щ閲� * @return 鍒楄〃 */ 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鏌ヨ @@ -72,12 +110,30 @@ public MetaEntity selectById(int id); /** - * 鏌ヨ鍏冩暟鎹枃浠� + * 鏍规嵁GUID鏌ヨ * - * @param ids 鍏冩暟鎹甀D闆嗗悎 - * @return 鍏冩暟鎹枃浠堕泦鍚� + * @param guid 鏂囦欢GUID + * @param tab 琛ㄥ悕 + * @return */ - public List<MetaFileEntity> selectMetaFiles(List<Integer> ids); + public MetaEntity selectByGuid(String guid, String tab); + + /** + * 鏌ヨ婧愭暟鎹枃浠� + * + * @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); /** * 鎻掑叆涓�鏉� -- Gitblit v1.9.3