From 41aacf110288329a6beb494ccccaeabd217a08b9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 05 十二月 2023 18:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
index b92ce23..964f2d5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
@@ -18,10 +18,13 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.vci.ubcs.code.entity.CodeAllcode;
-import com.vci.ubcs.code.vo.pagemodel.CodeAllcodeVO;
+import com.vci.ubcs.code.entity.CodeAllCode;
+import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 鍏ㄩ儴鐮佸�� Mapper 鎺ュ彛
@@ -29,16 +32,25 @@
  * @author ludc
  * @since 2023-04-03
  */
-public interface CodeAllcodeMapper extends BaseMapper<CodeAllcode> {
+public interface CodeAllCodeMapper extends BaseMapper<CodeAllCode> {
 
 	/**
 	 * 鑷畾涔夊垎椤�
 	 *
 	 * @param page
-	 * @param CodeAllcode
+	 * @param codeAllCode
 	 * @return
 	 */
-	List<CodeAllcodeVO> selectCodeAllcodePage(IPage page, CodeAllcodeVO CodeAllcode);
+	List<CodeAllCodeVO> selectCodeAllCodePage(IPage page, CodeAllCodeVO codeAllCode);
+
+	/**
+	 * 鍒嗙粍缁熻鏈�澶ф祦姘村��
+	 *
+	 * @param codeClassifyOid
+	 * @return
+	 */
+//	@MapKey("OID")
+	List<CodeAllCode> selectGroupByClassify(@Param("codeClassifyOid") String codeClassifyOid,@Param("replaceString") String replaceString);
 
 
 }

--
Gitblit v1.9.3