From a1ebb929644867237e305ee4ed6dfd2410dccb2e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 09 一月 2025 17:26:33 +0800
Subject: [PATCH] 1、优化”时段未曾开阀“功能实现; 2、”截止时间“改为”结束时间“

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 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 9789d67..9a94c28 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,8 @@
 
 
 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;
 import org.apache.ibatis.annotations.Mapper;
@@ -24,13 +26,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();
 
     /**
      * 閫昏緫鍒犻櫎
@@ -156,7 +158,7 @@
      * 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛
      * @return
      */
-    List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operator") Long operator);
+    List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operatorId") Long operatorId);
 
     /**
      * 鍙栨按鍙e悕绉版崲鍙栨按鍙D锛屾壂鐮佸紑闃�浣跨敤
@@ -180,4 +182,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