From 119b55b59e4d6af0e8881fae671eaa3a1c9fd6ac Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期三, 10 一月 2024 10:26:10 +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 | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 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 1b0a786..5ea88bb 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 @@ -11,6 +11,7 @@ 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 org.apache.ibatis.annotations.Param; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.tool.api.R; import java.io.File; @@ -223,6 +224,13 @@ List<CodeClassify> selectAllLevelParents(String oid); /** + * 鑾峰彇鎵�鏈変笂绾ц妭鐐圭殑oid + * @param oid + * @return + */ + List<String> selectAllParentOid(String oid); + + /** * 涓婚敭鑾峰彇涓婚搴撳垎绫� * @param oid 涓婚敭 * @return 涓婚搴撳垎绫绘樉绀哄璞� @@ -291,8 +299,21 @@ /** * 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅 * @param oid + * @param fieldInPath * @return */ - List<CodeClassifyVO> selectAllClassifyByOid(String oid); + List<CodeClassifyVO> selectAllClassifyByOid(String oid, String fieldInPath); + /** + * 鏍规嵁椤跺眰鑺傜偣oid鏌ヨ鎵�鏈夐櫎褰撳墠鑺傜偣浠ュ鎵�鏈変笉鍙備笌鏍￠獙鐨勫垎绫籵id + * @param topOid + * @param currentOid + * @return + */ + String selectLeafByParentClassifyOid(String topOid, String currentOid); + + /** + * 娴佹按渚濊禆鐢熸垚 + */ + R flowingDependencyGen(String classifyOid); } -- Gitblit v1.9.3