From 38f0f601c507fa9a7a27754e9f1a1bd10f913899 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 03 十二月 2023 23:07:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java | 71 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
index 50c64a0..54cc68f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
@@ -5,15 +5,15 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.entity.CodeClassify;
-import com.vci.ubcs.code.vo.CodeOsattributeVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
-import com.vci.ubcs.starter.web.pagemodel.DataGrid;
-import com.vci.ubcs.starter.web.pagemodel.Tree;
+import com.vci.ubcs.starter.web.pagemodel.DataGrid;import com.vci.ubcs.starter.web.pagemodel.Tree;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.R;
-
import java.io.File;
import java.util.Collection;
import java.util.List;
@@ -34,6 +34,13 @@
List<CodeClassify> selectByWrapper(Wrapper wrapper);
/**
+ * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
+ * @param wrapper 鏌ヨ灏佽鍣�
+ * @return 鏁版嵁瀵硅薄
+ */
+ List<String> select1(Wrapper wrapper);
+
+ /**
* 鑷畾涔夊垎椤�
*
* @param page
@@ -47,14 +54,15 @@
* @param codeClassifyEntity 涓婚搴撳垎绫绘暟鎹紶杈撳璞�
* @return 鎵ц缁撴灉
*/
- R addSave(CodeClassify codeClassifyEntity) ;
+ R addSave(CodeClassify codeClassifyEntity);
/**
* 淇敼涓婚搴撳垎绫�
* @param codeClassifyEntity 涓婚搴撳垎绫绘暟鎹紶杈撳璞�
* @return 鎵ц缁撴灉
*/
- R editSave(CodeClassify codeClassifyEntity) ;
+ R editSave(CodeClassify codeClassifyEntity);
+
/**
* 妫�鏌� 涓婚搴撳垎绫绘槸鍚﹀垹闄�
* @param codeClassify 涓婚搴撳垎绫绘暟鎹紶杈撳璞★紝蹇呴』瑕佹湁oid鍜宼s灞炴��
@@ -127,6 +135,7 @@
* @return 涓婚搴撳垎绫绘樉绀烘爲
*/
List<Tree> referTree(TreeQueryObject treeQueryObject);
+
/**
* 鏌ヨ涓婚搴撳垎绫� 鏍�
* @param treeQueryObject 鏍戞煡璇㈠璞�
@@ -169,7 +178,7 @@
* @param baseQueryObject 鏌ヨ瀵硅薄锛屽繀椤绘湁codeClassifyOid锛屾敮鎸乮d鍜宯ame涓ょ鏌ヨ鏉′欢
* @return 灞炴�х殑淇℃伅锛屽寘鍚粯璁ょ殑灞炴��
*/
- DataGrid<CodeOsattributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject);
+ DataGrid<BtmTypeAttributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject) throws ServiceException;
/**
* 鑾峰彇褰撳墠鍒嗙被鐨勯《灞傚垎绫�
@@ -192,7 +201,6 @@
* @return 鍒嗙被鐨勬樉绀哄璞�
*/
CodeClassifyVO getObjectByIdPath(String idPath);
-
/**
* 涓婚搴撶殑鏍�
@@ -229,7 +237,6 @@
*/
CodeClassifyFullInfoBO getClassifyFullInfo(String codeClassifyOid);
-
/**
* 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞�
* @param clsfNamePath 鍒嗙被鍚嶇О鐨勮矾寰勶紝涓�瀹氳浠庢渶椤跺眰鑺傜偣寮�濮嬶紝鏍煎紡涓簒xx/yyy/zz 杩欐牱
@@ -252,4 +259,50 @@
*/
List<CodeClassifyVO> selectCodeClassifyDOByTree(TreeQueryObject treeQueryObject);
+ /**
+ * 缁熻瀛愯妭鐐圭殑涓暟
+ *
+ * @param codeClassifyOid 鍒嗙被鐨勪富閿�
+ * @return 涓暟
+ */
+ int countChildrenByClassifyOid(String codeClassifyOid);
+
+ /***
+ * 鏍规嵁鐖惰妭鐐规煡璇笅绾у彾瀛愯妭鐐�
+ * @param parentId
+ * @return
+ */
+ List<CodeClassifyVO> selectCodeClassifyVOByParentId(String parentId);
+
+ /***
+ * 鏍规嵁搴撹妭鐐瑰悕绉拌幏鍙栧垎绫�
+ * @param libName
+ * @return
+ */
+ List<CodeClassifyVO> getRMLibByName(String libName);
+
+ /***
+ * 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
+ * @param desc
+ * @param codeLibName
+ * @return
+ */
+ List<CodeClassifyVO> getRMTypeByDescAndLib(String desc,String codeLibName);
+
+ /**
+ * 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
+ * @param oid
+ * @param fieldInPath
+ * @return
+ */
+ List<CodeClassifyVO> selectAllClassifyByOid(String oid, String fieldInPath);
+
+ /**
+ * 鏍规嵁椤跺眰鑺傜偣oid鏌ヨ鎵�鏈夐櫎褰撳墠鑺傜偣浠ュ鎵�鏈変笉鍙備笌鏍￠獙鐨勫垎绫籵id
+ * @param topOid
+ * @param currentOid
+ * @return
+ */
+ String selectLeafByParentClassifyOid(String topOid, String currentOid);
+
}
--
Gitblit v1.9.3