From c8f873c85f86c50c479900abea194dc6bb46a2e4 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 27 九月 2024 18:10:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
index 8c21a3c..c489099 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
@@ -4,10 +4,7 @@
import com.vci.corba.omd.btm.BizType;
import com.vci.dto.OsBtmTypeDTO;
import com.vci.model.IndexObject;
-import com.vci.pagemodel.OsBtmTypeAttributeVO;
-import com.vci.pagemodel.OsBtmTypeVO;
-import com.vci.pagemodel.OsERVO;
-import com.vci.pagemodel.OsUsedAttributeVO;
+import com.vci.pagemodel.*;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
@@ -49,6 +46,11 @@
* @return 涓氬姟绫诲瀷瀵硅薄
*/
List<OsBtmTypeVO> selectAllBtm();
+ /**
+ * 鏌ヨ鎵�鏈夌殑涓氬姟绫诲瀷
+ * @return 涓氬姟绫诲瀷瀵硅薄
+ */
+ List<OsBtmTypeVO> selectAllBtm(Map<String, OsAttributeVO> attributeVOMap);
/**
* 鑾峰彇鍚嶅瓧浠ilter寮�濮嬬殑涓氬姟绫诲瀷(for 鏌ヨ)锛屼富瑕佺敤浜庡睘鎬ф睜鐨勪笟鍔＄被鍨嬮�夋嫨瀵硅瘽妗�
@@ -74,18 +76,24 @@
Map<String,OsBtmTypeVO> selectAllBtmMap();
/**
+ * 鏌ヨ鎵�鏈夌殑涓氬姟绫诲瀷鏄犲皠
+ * @return key 鏄笟鍔＄殑鑻辨枃鍚嶇О鐨勫皬鍐�
+ */
+ Map<String,OsBtmTypeVO> selectAllBtmMap(Map<String, OsAttributeVO> attributeVOMap);
+
+ /**
* 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
* @param btmItems 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- List<OsBtmTypeVO> btmDO2VOs(Collection<BizType> btmItems);
+ List<OsBtmTypeVO> btmDO2VOs(Collection<BizType> btmItems,Map<String, OsAttributeVO> attributeVOMap);
/**
* 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
* @param btmItem 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- OsBtmTypeVO btmDO2VO(BizType btmItem);
+ OsBtmTypeVO btmDO2VO(BizType btmItem, Map<String, OsAttributeVO> attributeVOMap);
/**
* 浣跨敤缂栧彿鑾峰彇涓氬姟绫诲瀷
@@ -100,6 +108,12 @@
* @return 涓氬姟绫诲瀷
*/
OsBtmTypeVO getBtmById(String id);
+ /**
+ * 浣跨敤缂栧彿鑾峰彇涓氬姟绫诲瀷
+ * @param id 缂栧彿
+ * @return 涓氬姟绫诲瀷
+ */
+ OsBtmTypeVO getBtmById(String id, Map<String, OsAttributeVO> attributeVOMap);
/**
* 鑾峰彇涓氬姟绫诲瀷鐨勫湪鍝釜灞炴�т腑浣跨敤
--
Gitblit v1.9.3