From f2e8b17c7df35a8efb3b32d821bea54775b253ab Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 15 六月 2023 21:22:40 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 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 a363528..ee1824a 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,17 +72,46 @@
/**
* 鏌ユ壘鏍戝舰缁撴瀯
*
+ * @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);
- @MapKey("oid")
+ @MapKey("OID")
List<Map<String,Object>> selectAllLevelParentByOid(@Param("oid") String 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);
+
+
}
--
Gitblit v1.9.3