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-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
index 2a9bf1e..e3080e5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -287,11 +287,24 @@
         return response.getBody();
     }
 
+
     /**
-     * 寰楀埌鎵�鏈夊彇姘村彛鍚嶇О
+     * 鍙栨按鍙e悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
+     * @param intakeName
      * @return
      */
-    public List<String> getIntakeName() {
-        return prIntakeMapper.getIntakeName();
+    public List<Long> getIntakeIdsByName(String intakeName) {
+        return prIntakeMapper.getIntakeIdsByName(intakeName);
     }
+
+    /**
+     * 鍙栨按鍙e悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
+     * @param intakeName
+     * @return
+     */
+    public List<Long> getIntakeIdByNameExcludeId(Long id, String intakeName) {
+        return prIntakeMapper.getIntakeIdByNameExcludeId(id, intakeName);
+    }
+
+
 }

--
Gitblit v1.8.0