From b9e0f06eb30c3b77171cd78b9311758d17400d5b Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期六, 06 七月 2024 10:39:31 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
index 3cea409..bbdc3d0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
@@ -141,15 +141,17 @@
Long getIntakeIdByName(String intakeName);
/**
- * 寰楀埌鎵�鏈夌殑鍙栨按鍙ｅ悕绉�
- * @return
- */
- List<String> getIntakeName();
-
- /**
* 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
* @param intakeName
* @return
*/
- List<Long> getIntakeIdByName1(String intakeName);
+ List<Long> getIntakeIdsByName(String intakeName);
+
+ /**
+ * 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
+ * @param id
+ * @param intakeName
+ * @return
+ */
+ List<Long> getIntakeIdByNameExcludeId(@Param("id")Long id, @Param("intakeName")String intakeName);
}
--
Gitblit v1.8.0