From acb7c4c272aa02c2ed24cde72db429defef9fb8f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 27 七月 2023 13:54:02 +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 | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 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..6f30181 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);
/**
@@ -67,7 +67,22 @@
* @param oid 鍒嗙被鐨勪富閿�
* @return 鏁版嵁闆嗗悎
*/
- List<CodeClassify> selectCodeClassifyVOByTree(@Param("oid") String oid);
+ List<CodeClassify> selectCodeClassifyVOByTree(@Param("oid") String oid,@Param("tenantId") String tenantId);
+
+ /**
+ * 鏌ユ壘鏍戝舰缁撴瀯
+ *
+ * @return 鏁版嵁闆嗗悎
+ */
+ List<CodeClassify> selectCodeClassifyDOByTree(@Param("id") String id,@Param("lcstatus") String lcstatus,@Param("parentcodeclassifyoid") String parentcodeclassifyoid,@Param("tenantId") String tenantId);
+
+ /**
+ * 鏌ヨ鏁版嵁涓嶱L_CODE_KEYATTRREPEAT銆丳L_CODE_RESEMBLERULE銆丳L_CODE_RULE鑱旀煡
+ *
+ * @param oids 鍒嗙被鐨勪富閿�
+ * @return 鏁版嵁闆嗗悎
+ */
+ List<CodeClassify> selectClassifyByKeyAndReseRel(@Param("oids") String oids);
/**
* 鏌ユ壘鏍戝舰缁撴瀯
@@ -75,17 +90,31 @@
* @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