From 20afccf343cd9c2f8efb1a20a0e92d4844a4adfa Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 06 六月 2025 17:30:44 +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 | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 3932653..1545ca5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
@@ -434,8 +434,27 @@
FROM ir_irrigate_schedule sche
INNER JOIN ir_plan_schedule ps ON schedule_id = sche.id
WHERE ps.plan_id = #{planId}
- LIMIT 1
+<!-- LIMIT 1-->
) 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鑾峰彇璁″垝鏈�鏂扮姸鎬�-->
@@ -444,7 +463,7 @@
IF(plan_state = 1, 1,
IF(executing_state = 3, 5,
IF(NOW() < plan_start_time, 2,
- IF(NOW() > plan_stop_time, 3, 4)
+ IF(NOW() < plan_stop_time, 3, 4)
)
)
) AS planState
--
Gitblit v1.8.0