From 336265194a47bcbdbd5f8d2274d10a6284ee1246 Mon Sep 17 00:00:00 2001
From: mamc <1428594221@qq.com>
Date: 星期三, 28 六月 2023 14:43:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
index e6bf833..4f1778a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -48,8 +49,8 @@
* @param oid
* @return
*/
- @MapKey("oid")
- Map<String,String> selectAllLevelChildOid(String oid);
+ @MapKey("OID")
+ Map<String,String> selectAllLevelChildOid(@Param("oid") String oid);
/**
* 鏍￠獙鏄惁鍖呭惈瀛愯妭鐐�
@@ -58,7 +59,7 @@
* @return true 琛ㄧず鍖呭惈
*/
// @MapKey("oid")
- Boolean checkHasChild(String oid);
+ Boolean checkHasChild(@Param("oid") String oid);
/**
* 鏌ユ壘鏍戝舰缁撴瀯
@@ -66,7 +67,22 @@
* @param oid 鍒嗙被鐨勪富閿�
* @return 鏁版嵁闆嗗悎
*/
- List<CodeClassify> selectCodeClassifyVOByTree(String oid);
+ List<CodeClassify> selectCodeClassifyVOByTree(@Param("oid") String oid);
+
+ /**
+ * 鏌ユ壘鏍戝舰缁撴瀯
+ *
+ * @return 鏁版嵁闆嗗悎
+ */
+ List<CodeClassify> selectCodeClassifyDOByTree(@Param("id") String id,@Param("lcstatus") String lcstatus,@Param("parentcodeclassifyoid") String parentcodeclassifyoid);
+
+ /**
+ * 鏌ヨ鏁版嵁涓嶱L_CODE_KEYATTRREPEAT銆丳L_CODE_RESEMBLERULE銆丳L_CODE_RULE鑱旀煡
+ *
+ * @param oids 鍒嗙被鐨勪富閿�
+ * @return 鏁版嵁闆嗗悎
+ */
+ List<CodeClassify> selectClassifyByKeyAndReseRel(@Param("oids") String oids);
/**
* 鏌ユ壘鏍戝舰缁撴瀯
@@ -74,6 +90,31 @@
* @param oid 鍒嗙被鐨勪富閿�
* @return 鏁版嵁闆嗗悎
*/
- List<CodeClassify> selectAllLevelChildHasPath(String oid);
+ List<CodeClassify> selectAllLevelChildHasPath(@Param("oid") String oid,@Param("fieldInPath")String fieldInPath);
+
+ @MapKey("OID")
+ List<Map<String,Object>> selectAllLevelParentByOid(@Param("oid") String oid);
+
+ @MapKey("OID")
+ List<Map<String,Object>> selectAllLevelParents(@Param("oid") String oid);
+
+
+ @MapKey("OID")
+ List<Map<String,Object>> selectByFieldPath(@Param("fieldPath") String fieldPath);
+
+
+ /**
+ * 鏌ユ牴鎹甶d灞傜骇鑾峰彇瀵硅薄
+ *
+ * @param fieldPath 鍒嗙被鐨勪富閿�
+ * @param fieldName 鍒嗙被鐨勪富閿�
+ * @return 鏁版嵁闆嗗悎
+ */
+ List<CodeClassify> selectByFieldNamePath(@Param("fieldPath") String fieldPath,@Param("fieldName") String fieldName);
+
+ public List<CodeClassifyVO> getIdPathToNamePathByParentId(@Param("parentId")String parentId);
+
+
+ CodeClassify selectByIdRel(@Param("oid") String oid);
}
--
Gitblit v1.9.3