From 842237345ac469b02e9add8f9fd8bae5d4f7cdac Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 25 二月 2025 14:33:15 +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 |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 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 722b709..1a44d5e 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
@@ -2,6 +2,7 @@
 
 
 import com.dy.pipIrrGlobal.pojoPr.PrIntake;
+import com.dy.pipIrrGlobal.voPr.IntakeUpdateLngLat;
 import com.dy.pipIrrGlobal.voPr.VoAllIntake;
 import com.dy.pipIrrGlobal.voPr.VoIntake;
 import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
@@ -25,7 +26,7 @@
      * @param id primary key
      * @return object by primary key
      */
-    PrIntake selectByPrimaryKey(Long id);
+    VoAllIntake selectByPrimaryKey(Long id);
 
     /**
      * 寰楀埌鍏ㄩ儴瀹炰綋
@@ -92,6 +93,13 @@
      * @return  address
      */
     Integer getRecordCountOfIntake(@Param("intakeId") Long intakeId);
+
+    /**
+     * 鏍规嵁鏉慖d鑾峰彇鍏ㄩ儴鍦板潃
+     * @param intakeId 鏉慖d
+     * @return  intakeName  鍙栨按鍙g紪鍙�
+     */
+    String getNameById(@Param("intakeId") Long intakeId);
 
     /**
      * 鏍规嵁鏉慖d鑾峰彇鍏ㄩ儴鍦板潃
@@ -181,4 +189,12 @@
      */
     List<Long> getIntakeIdByNameExcludeId(@Param("id")Long id, @Param("intakeName")String intakeName);
 
+
+    /**
+     * app淇敼鍙栨按鍙g粡绾害
+     * @param record
+     * @return
+     */
+    int updateByPrimaryKeySelective1(IntakeUpdateLngLat record);
+
 }

--
Gitblit v1.8.0