From c6a54f63df671de4592e336b9b8cd8406d4e3b51 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 02 六月 2023 16:25:27 +0800
Subject: [PATCH] 解决动态模块冲突

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java
index d47082a..0049267 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java
@@ -1,11 +1,9 @@
 package com.vci.ubcs.omd.service;
 
 import com.vci.ubcs.omd.dto.BtmTypeDTO;
-import com.vci.ubcs.omd.dto.BtmTypeLinkAttributesDTO;
 import com.vci.ubcs.omd.entity.BtmType;
-import com.vci.ubcs.omd.entity.BtmTypeAttribute;
 import com.vci.ubcs.omd.entity.ModifyAttributeInfo;
-import com.vci.ubcs.omd.vo.BtmTypeTreeVO;
+import com.vci.ubcs.omd.vo.BtmTreeVO;
 import com.vci.ubcs.omd.vo.BtmTypeVO;
 import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
 import com.vci.ubcs.omd.vo.LinkTypeVO;
@@ -14,7 +12,6 @@
 import org.springblade.core.tool.api.R;
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -216,7 +213,7 @@
 	 * 鎸塪omain鍒嗙粍锛屾煡璇笟鍔＄被鍨嬪睘鎬х粨鏋�
 	 * @return 鏌ヨ缁撴灉
 	 */
-    List<BtmTypeTreeVO> treeDomain();
+    List<BtmTreeVO> treeDomain();
 
 	/**
 	 * 浠庢暟鎹簱琛ㄤ腑鑾峰彇
@@ -232,4 +229,25 @@
 	 * @return 鎵ц缁撴灉
 	 */
 	List<BtmTypeVO> saveFromTable(List<BtmTypeDTO> btmTypeDTOList,String domain);
+
+	/**
+	 * 鎸夌収涓氬姟绫诲瀷id鑾峰彇榛樿灞炴��
+	 * @param btmTypeId 涓氬姟绫诲瀷id
+	 * @return 涓氬姟绫诲瀷
+	 */
+    BtmTypeVO getDefaultAttrByBtmId(String btmTypeId);
+
+	/**
+	 * 鎸夌収涓氬姟绫诲瀷id鑾峰彇鎵�鏈夌殑灞炴��
+	 * @param btmTypeId 涓氬姟绫诲瀷id
+	 * @return 涓氬姟绫诲瀷
+	 */
+	BtmTypeVO getAllAttributeByBtmId(String btmTypeId);
+
+	/**
+	 * 鎸夌収涓氬姟绫诲瀷涓婚敭鑾峰彇鎵�鏈夌殑灞炴��
+	 * @param btmTypeOid 涓氬姟绫诲瀷涓婚敭
+	 * @return 涓氬姟绫诲瀷
+	 */
+	BtmTypeVO getAllAttributeByBtmOid(String btmTypeOid);
 }

--
Gitblit v1.9.3