From 02dbaaa04bc443e860a715cf907bc0fb5c1a7da4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 11 七月 2023 09:09:34 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java |   39 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 34 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 ce03874..205389e 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
@@ -49,7 +49,7 @@
 	 * @param oid
 	 * @return
 	 */
-	@MapKey("oid")
+	@MapKey("OID")
 	Map<String,String> selectAllLevelChildOid(@Param("oid") String oid);
 
 	/**
@@ -72,20 +72,49 @@
 	/**
 	 * 鏌ユ壘鏍戝舰缁撴瀯
 	 *
+	 * @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);
+
+	/**
+	 * 鏌ユ壘鏍戝舰缁撴瀯
+	 *
 	 * @param oid 鍒嗙被鐨勪富閿�
 	 * @return 鏁版嵁闆嗗悎
 	 */
-	List<CodeClassify> selectAllLevelChildHasPath(@Param("oid") String oid);
+	List<CodeClassify> selectAllLevelChildHasPath(@Param("oid") String oid,@Param("fieldInPath")String fieldInPath);
 
 
-	@MapKey("oid")
+	@MapKey("OID")
 	List<Map<String,Object>> selectAllLevelParentByOid(@Param("oid") String oid);
 
-	@MapKey("oid")
+	@MapKey("OID")
 	List<Map<String,Object>> selectAllLevelParents(@Param("oid") String oid);
 
 
-	@MapKey("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<CodeClassify> getIdPathToNamePathByParentId(@Param("parentId")String parentId);
+
+
+	CodeClassify selectByIdRel(@Param("oid") String oid);
 }

--
Gitblit v1.9.3