From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 53 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 94e29d9..46bafd5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
@@ -325,8 +325,9 @@
       IF(plan.executing_state = 3, 5, 4) AS planState
     FROM ir_irrigate_plan plan
         INNER JOIN ir_project pro ON pro.id = plan.project_id
-    WHERE plan.deleted = 0 AND ((plan.plan_state = 2 AND NOW() &gt;= plan.plan_stop_time) OR (plan.executing_state = 3))
-    ORDER BY plan.plan_state DESC
+        INNER JOIN ir_plan_operate po ON po.plan_id = plan.id
+    WHERE plan.deleted = 0 AND ((plan.plan_state = 2 AND NOW() &gt;= plan.plan_stop_time) OR (plan.executing_state = 3)) AND po.operate_type = 1
+    ORDER BY po.operate_time DESC
     <trim prefix="limit ">
       <if test="start != null and count != null">
         #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
@@ -396,4 +397,54 @@
     AND deleted = 0
   </select>
 
+  <!--鍒ゆ柇褰撳墠椤圭洰鏄惁瀛樺湪宸插彂甯冦�佹湭缁堟銆佹湭鍒犻櫎銆佹湭瀹屾垚鐨勮鍒掞紝鍙戝竷璁″垝鍓嶅垽鏂娇鐢�-->
+  <select id="hasPlan_CurrentProject" resultType="java.lang.Integer">
+    SELECT
+      COUNT(*) AS recordCount
+    FROM ir_irrigate_plan
+    WHERE project_id = (SELECT project_id FROM ir_irrigate_plan WHERE id = #{planId})
+      AND id != #{planId}
+      AND plan_state = 2
+      AND executing_state != 3
+      AND deleted = 0
+      AND NOW() &lt; plan_stop_time
+  </select>
+
+  <!--鍒ゆ柇褰撳墠璁″垝鍖呭惈鐨勮疆鐏岀粍鏄惁涓庡叾浠栭」鐩笅璁″垝鍖呭惈鐨勮疆鐏岀粍鏈変氦闆嗭紝涓斿叾浠栭」鐩殑璁″垝鐘舵�佷负宸插彂甯冦�佹湭缁堟銆佹湭鍒犻櫎銆佹湭瀹屾垚锛屽彂甯冭鍒掑墠鍒ゆ柇浣跨敤-->
+  <select id="hasPlan_OtherProject" resultType="java.lang.Integer">
+    SELECT EXISTS(
+        SELECT sche.group_id
+        FROM ir_irrigate_plan plan
+            INNER JOIN ir_plan_schedule ps ON ps.plan_id = plan.id
+            INNER JOIN ir_irrigate_schedule sche ON sche.id = ps.schedule_id
+        WHERE plan.project_id != (SELECT project_id FROM ir_irrigate_plan WHERE id = #{planId})
+            AND plan_state = 2
+            AND executing_state != 3
+            AND deleted = 0
+            AND NOW() &lt; plan_stop_time
+
+        INTERSECT
+
+        SELECT sche.group_id
+        FROM ir_irrigate_schedule sche
+            INNER JOIN ir_plan_schedule ps ON schedule_id = sche.id
+        WHERE ps.plan_id = #{planId}
+        LIMIT 1
+    ) AS has_intersection
+  </select>
+
+  <!--鏍规嵁璁″垝ID鑾峰彇璁″垝鏈�鏂扮姸鎬�-->
+  <select id="getPlanLatestState" resultType="java.lang.Integer">
+    SELECT
+        IF(plan_state = 1, 1,
+            IF(executing_state = 3, 5,
+                IF(NOW() &lt; plan_start_time, 2,
+                  IF(NOW() > plan_stop_time, 3, 4)
+                )
+            )
+    ) AS planState
+    FROM ir_irrigate_plan
+    WHERE deleted = 0 AND id = #{planId}
+  </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0