From 61c0c3ccae4c23a90c405d7ac1cb49f7d5ee0479 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 12 九月 2023 09:48:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java
index 0f3e536..7127f2f 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
 import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellParam;
 
@@ -97,11 +98,20 @@
      */
     public void checkWellAllowed(ArdAlarmpointsWell well);
 
+    /**
+     * 鏍稿浜曞彿鏄惁鍞竴
+     *
+     * @param id 闇�瑕佹牳瀵圭殑浜曠殑涓婚敭
+     * @return 缁撴灉
+     */
+
+    public Boolean checkWellIdExists(ArdAlarmpointsWell well);
+
     List<ArdAlarmpointsWell> wellByDeptList(List<Long> deptList);
 
     ArdAlarmpointsWell wellById(String id);
 
     List<ArdAlarmpointsWell> wellList(List<Long> deptList);
 
-    List<ArdAlarmpointsWell> conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam);
+    PageInfo<ArdAlarmpointsWell> conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam);
 }

--
Gitblit v1.9.3