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/resources/mapper/IrIrrigatePlanMapper.xml | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
index e0c32f9..2837fc5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
@@ -438,6 +438,25 @@
) AS has_intersection
</select>
+ <!--鍒ゆ柇褰撳墠璁″垝涓庢渶杩戠粓姝㈢殑璁″垝鐨勮疆鐏岀粍鏄惁鏈夐噸鍙� -->
+ <select id="hasPlanOverlapWithTerminated" resultType="java.lang.Integer">
+ SELECT COUNT(1)
+ FROM (
+ SELECT sche1.group_id
+ FROM ir_plan_schedule ps1
+ INNER JOIN ir_irrigate_schedule sche1 ON ps1.schedule_id = sche1.id
+ WHERE ps1.plan_id = #{planId}
+ ) AS current_groups
+ INNER JOIN (
+ SELECT sche2.group_id
+ FROM ir_plan_schedule ps2
+ INNER JOIN ir_irrigate_schedule sche2 ON ps2.schedule_id = sche2.id
+ WHERE ps2.plan_id = #{terminatedPlanId}
+ ) AS terminated_groups
+ ON current_groups.group_id = terminated_groups.group_id
+ LIMIT 1
+ </select>
+
<!--鏍规嵁璁″垝ID鑾峰彇璁″垝鏈�鏂扮姸鎬�-->
<select id="getPlanLatestState" resultType="java.lang.Integer">
SELECT
--
Gitblit v1.8.0