From 2e0aff8e8d9d9976a9e22b2608edee6dfdec0991 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 30 四月 2025 16:26:50 +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/daoIr/IrIrrigatePlanMapper.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java
index a0d9f99..c7e6677 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java
@@ -131,6 +131,14 @@
     Integer hasPlan_OtherProject(Long planId);
 
     /**
+     * 鍒ゆ柇褰撳墠璁″垝涓庢渶杩戠粓姝㈢殑璁″垝鐨勮疆鐏岀粍鏄惁鏈夐噸鍙�
+     * @param planId 褰撳墠璁″垝ID
+     * @param terminatedPlanId 鏈�杩戠粓姝㈢殑璁″垝ID
+     * @return
+     */
+    Integer hasPlanOverlapWithTerminated(@Param("planId") Long planId, @Param("terminatedPlanId") Long terminatedPlanId);
+
+    /**
      * 鏍规嵁璁″垝ID鑾峰彇璁″垝鏈�鏂扮姸鎬�
      * @param planId
      * @return

--
Gitblit v1.8.0