From 4a2deb11b819dd78a8c75e244ef67ec2e48cf5f5 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 14 四月 2025 21:03:28 +0800
Subject: [PATCH] 重构轮灌组修改接口

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 50 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 c5c2f24..35a5b41 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,8 +2,7 @@
 
 
 import com.dy.pipIrrGlobal.pojoPr.PrIntake;
-import com.dy.pipIrrGlobal.voPr.VoIntake;
-import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
+import com.dy.pipIrrGlobal.voPr.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,13 +23,13 @@
      * @param id primary key
      * @return object by primary key
      */
-    PrIntake selectByPrimaryKey(Long id);
+    VoAllIntake selectByPrimaryKey(Long id);
 
     /**
      * 寰楀埌鍏ㄩ儴瀹炰綋
      * @return 鍏ㄩ儴瀹炰綋
      * */
-    List<PrIntake> selectAll();
+    List<VoAllIntake> selectAll();
 
     /**
      * 閫昏緫鍒犻櫎
@@ -94,6 +93,13 @@
 
     /**
      * 鏍规嵁鏉慖d鑾峰彇鍏ㄩ儴鍦板潃
+     * @param intakeId 鏉慖d
+     * @return  intakeName  鍙栨按鍙ｇ紪鍙�
+     */
+    String getNameById(@Param("intakeId") Long intakeId);
+
+    /**
+     * 鏍规嵁鏉慖d鑾峰彇鍏ㄩ儴鍦板潃
      * @param villageId 鏉慖d
      * @return  address  鍏ㄩ儴浜旂骇鍦板潃
      */
@@ -113,19 +119,36 @@
     List<Map<String, Object>> getNoBindingIntakes();
 
     /**
-     * 鑾峰彇鍙栨按鍙ｆ暟閲忥紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛夊簾寮�
+     * 鑾峰彇鍙栨按鍙ｆ暟閲忥紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛�
      * @param params
      * @return
      */
     Long getOnLineIntakesCount(Map<?, ?> params);
 
     /**
-     * 鑾峰彇鍙栨按鍙ｅ垪琛紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛夊簾寮�
+     * 鑾峰彇鍙栨按鍙ｅ垪琛紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛�
      * @param params
      * @return
      */
     //List<VoOnLineIntake> getOnLineIntakes(@Param("onLineMap") String onLineMap, @Param("isOnLine") Boolean isOnLine);
     List<VoOnLineIntake> getOnLineIntakes(Map<?, ?> params);
+
+
+    /**
+     * 鑾峰彇鍙栨按鍙ｆ暟閲忥紙鍦ㄧ嚎鎴栦笉鍦ㄧ嚎锛�
+     * @param params
+     * @return
+     */
+    Long selectIntakesCountForOnLine(Map<?, ?> params);
+
+    /**
+     * 鑾峰彇鍙栨按鍙ｅ垪琛ㄥ湪绾挎垨涓嶅湪绾匡級
+     * @param params
+     * @return
+     */
+    List<VoOnLineIntake> selectIntakesForOnLine(Map<?, ?> params);
+
+
 
     /**
      * 鏍规嵁鍙栨按鍙ｇ紪鍙疯幏鍙栧彇姘村彛瀵硅薄
@@ -139,7 +162,7 @@
      * 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛
      * @return
      */
-    List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operator") Long operator);
+    List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operatorId") Long operatorId);
 
     /**
      * 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛屾壂鐮佸紑闃�浣跨敤
@@ -162,4 +185,24 @@
      * @return
      */
     List<Long> getIntakeIdByNameExcludeId(@Param("id")Long id, @Param("intakeName")String intakeName);
+
+
+    /**
+     * app淇敼鍙栨按鍙ｇ粡绾害
+     * @param record
+     * @return
+     */
+    int updateByPrimaryKeySelective1(IntakeUpdateLngLat record);
+
+    /**
+     * 鑾峰彇鏈粦瀹氬埌杞亴缁勭殑鍙栨按鍙ｅ垪琛�
+     * @return
+     */
+    List<VoIntakeSimple> getFreeIntakes(Map<?, ?> params);
+
+    /**
+     * 鑾峰彇鏈粦瀹氳櫄鎷熷崱鐨勫彇姘村彛鍒楄〃锛岀粰鍙栨按鍙ｇ粦铏氭嫙鍗′娇鐢�
+     * @return
+     */
+    List<VoIntakeSimple> getNotLinkVcIntakes();
 }

--
Gitblit v1.8.0