From 6732cd7a4e0fd7ea083d4ae11254bde35adb1ee4 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 17 十一月 2023 01:39:20 +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 |   87 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 78 insertions(+), 9 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 d0fa083..d0b93e0 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
@@ -41,7 +41,7 @@
 	 * @param plCodeClassify
 	 * @return
 	 */
-	List<CodeClassifyVO> selectPlCodeClassifyPage(IPage page, CodeClassifyVO plCodeClassify);
+	List<CodeClassifyVO> selectPlCodeClassifyPage(IPage page, CodeClassifyVO plCodeClassify,@Param("tenantId") String tenantId);
 
 	/**
 	 * 鏌ユ壘瀛愮被
@@ -58,7 +58,7 @@
 	 * @param oid 鍒嗙被鐨勪富閿�
 	 * @return true 琛ㄧず鍖呭惈
 	 */
-//	@MapKey("oid")
+	//	@MapKey("oid")
 	Boolean checkHasChild(@Param("oid") String oid);
 
 	/**
@@ -67,14 +67,14 @@
 	 * @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);
+	List<CodeClassify> selectCodeClassifyDOByTree(@Param("id") String id,@Param("lcstatus") String lcstatus,@Param("parentcodeclassifyoid") String parentcodeclassifyoid,@Param("tenantId") String tenantId/*,@Param("tableName") String tableName*/);
 
 	/**
 	 * 鏌ヨ鏁版嵁涓嶱L_CODE_KEYATTRREPEAT銆丳L_CODE_RESEMBLERULE銆丳L_CODE_RULE鑱旀煡
@@ -90,8 +90,7 @@
 	 * @param oid 鍒嗙被鐨勪富閿�
 	 * @return 鏁版嵁闆嗗悎
 	 */
-	List<CodeClassify> selectAllLevelChildHasPath(@Param("oid") String oid);
-
+	List<CodeClassify> selectAllLevelChildHasPath(@Param("oid") String oid,@Param("fieldInPath")String fieldInPath,@Param("tenantId")String tenantId);
 
 	@MapKey("OID")
 	List<Map<String,Object>> selectAllLevelParentByOid(@Param("oid") String oid);
@@ -99,10 +98,8 @@
 	@MapKey("OID")
 	List<Map<String,Object>> selectAllLevelParents(@Param("oid") String oid);
 
-
 	@MapKey("OID")
 	List<Map<String,Object>> selectByFieldPath(@Param("fieldPath") String fieldPath);
-
 
 	/**
 	 * 鏌ユ牴鎹甶d灞傜骇鑾峰彇瀵硅薄
@@ -113,5 +110,77 @@
 	 */
 	List<CodeClassify> selectByFieldNamePath(@Param("fieldPath") String fieldPath,@Param("fieldName") String fieldName);
 
-	public List<CodeClassifyVO> getIdPathToNamePathByParentId(@Param("parentId")String parentId);
+	public List<CodeClassify> getIdPathToNamePathByParentId(@Param("parentId")String parentId);
+
+	CodeClassify selectByIdRel(@Param("oid") String oid);
+	/**
+	 * 鏍规嵁鐖惰妭鐐筰d鏌ヨ褰撳墠鑺傜偣瀛愯妭鐐规暟鎹�
+	 *
+	 * @param parentOid 鍒嗙被鐨勪富閿�
+	 * @return 鏁版嵁闆嗗悎
+	 */
+	List<CodeClassify> 	selectCodeClassifyDOByParentId(@Param("parentOid")String parentOid,@Param("tenantId") String tenantId);
+
+	/***
+	 * 鏍规嵁搴撹妭鐐瑰悕绉拌幏鍙栧垎绫�
+	 * @param libNames
+	 * @param lcstatus
+	 * @param tenantId
+	 * @return
+	 */
+	List<CodeClassify> getRMLibByName(List<String> libNames,@Param("lcstatus")String lcstatus,@Param("tenantId") String tenantId);
+
+	/***
+	 * 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
+	 * @param desc
+	 * @param lcstatus
+	 * @param tenantId
+	 * @return
+	 */
+	List<CodeClassify> getRMTypeByDesc(@Param("desc")String desc,@Param("lcstatus")String lcstatus,@Param("tenantId") String tenantId);
+
+	/***
+	 * 鏍规嵁褰撳墠鍒嗙被鑾峰彇涓婄骇鍒嗙被淇℃伅
+	 * @param oid
+	 * @param tenantId
+	 * @return
+	 */
+	List<CodeClassify>  selectAllParenClassifytByOid(@Param("oid")String oid,@Param("tenantId") String tenantId);
+
+	/**
+	 * 涓婚敭鏌ヨ褰撳墠鑺傜偣鍙婂叾瀛愯妭鐐�
+	 * @param oid 褰撳墠鑺傜偣涓婚敭
+	 * @return 鏌ヨ缁撴灉
+	 */
+    List<CodeClassify> selectStartWithCurrentOid(String oid);
+
+	/**
+	 * 鎵归噺鏇存柊鍒嗙被鐘舵��
+	 * @param classifyList
+	 */
+	void batchUpdateLcStatus(@Param("records") List<CodeClassify> classifyList);
+
+	/**
+	 * 鍚戜笂鏌ヨ鏍戝舰缁撴瀯
+	 *
+	 * @param oid 鍒嗙被鐨勪富閿�
+	 * @return 鏁版嵁闆嗗悎
+	 */
+	List<CodeClassify> selectAllParents(@Param("oid") String oid);
+
+	/***
+	 * 鏌ヨ褰撳墠鍒嗙被涓嬫墍鏈夊垎绫讳俊鎭�
+	 * @param oid
+	 * @return
+	 */
+	List<CodeClassify> selectAllClassifyByOid(@Param("oid") String oid,@Param("fieldInPath")String fieldInPath,@Param("tenantId") String tenantId);
+
+	/**
+	 * 鏍规嵁椤跺眰鑺傜偣oid鏌ヨ鎵�鏈夐櫎褰撳墠鑺傜偣浠ュ鎵�鏈変笉鍙備笌鏍¢獙鐨勫垎绫籵id
+	 * @param topOid
+	 * @param currentOid
+	 * @return
+	 */
+	List<CodeClassify> selectLeafByParentClassifyOid(@Param("topOid") String topOid,@Param("currentOid")String currentOid);
+
 }

--
Gitblit v1.9.3