From 391eec3114a17e68652434c6eae610799d80290e Mon Sep 17 00:00:00 2001 From: ludc <ludc@vci-tech.com> Date: 星期四, 16 一月 2025 11:13:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java index 96ffd58..8c3eaa2 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java @@ -3,11 +3,8 @@ import com.vci.corba.common.PLException; import com.vci.corba.omd.atm.AttributeDef; import com.vci.dto.OsAttributeDTO; -import com.vci.starter.web.pagemodel.BaseQueryObject; -import com.vci.starter.web.pagemodel.BaseResult; -import com.vci.starter.web.pagemodel.DataGrid; import com.vci.pagemodel.OsAttributeVO; -import org.springframework.web.multipart.MultipartFile; +import com.vci.starter.web.pagemodel.*; import java.io.File; import java.util.Collection; @@ -21,6 +18,12 @@ */ public interface OsAttributeServiceI extends OsBaseServiceI{ + /** + * 鑾峰彇鏍戠姸 + * @param treeQueryObject + * @return + */ + List<Tree> getTreeAttributesByBtmName(TreeQueryObject treeQueryObject); /** * 鑾峰彇榛樿鐨勫睘鎬� * @return 榛樿鐨勫睘鎬у垪琛� @@ -98,6 +101,14 @@ * @return 灞炴�х殑鏄剧ず瀵硅薄 */ List<OsAttributeVO> listAttrByIds(Collection<String> attrCodes); + + /** + * 浣跨敤灞炴�х紪鍙疯幏鍙栧璞�--鎵归噺 + * @param attrCodes 灞炴�х殑鑻辨枃鍚嶇О + * @param attributeVOMap 灞炴�у璞� + * @return 灞炴�х殑鏄剧ず瀵硅薄 + */ + List<OsAttributeVO> listAttrByIds(Collection<String> attrCodes, Map<String, OsAttributeVO> attributeVOMap); /** * 鎵归噺娣诲姞灞炴�� @@ -182,8 +193,9 @@ * 鏍规嵁涓氬姟绫诲瀷/閾炬帴绫诲瀷鑾峰彇灞炴�т俊鎭� * @param btName 涓氬姟绫诲瀷/閾炬帴绫诲瀷 * @param typeFlag 0:涓氬姟绫诲瀷,1:閾炬帴绫诲瀷 + * @param isDefault 鏄惁鍖呭惈榛樿灞炴�� true锛氬寘鍚紝false 涓嶅寘鍚� * @return */ - List<OsAttributeVO> getOsAttributeVOSByBtName(String btName,int typeFlag)throws Exception; + List<OsAttributeVO> getOsAttributeVOSByBtName(String btName,int typeFlag,boolean isDefault)throws Exception; } -- Gitblit v1.9.3