From b181d08b9c8c4f3f4d8c475a60506ba4d93c8382 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 09 四月 2025 11:38:23 +0800
Subject: [PATCH] 灌溉计划详情页，包含计划信息、轮灌组信息、取水口命令发布员结果信息

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 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 50a525a..287b5aa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
@@ -295,7 +295,11 @@
         ) 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 = 1 OR NOW() &lt; plan.plan_stop_time)
+    <where>
+      AND plan.deleted = 0
+      AND (plan.plan_state = 1 OR NOW() &lt; plan.plan_stop_time)
+      AND plan.executing_state != 3
+    </where>
     ORDER BY plan.plan_state DESC
   </select>
 
@@ -309,14 +313,10 @@
       plan.plan_start_time AS planStartTime,
       plan.plan_stop_time AS planStopTime,
       plan.duration,
-      IF(plan.plan_state = 1, 1,
-         IF(NOW() &lt; plan.plan_start_time, 2,
-            IF(NOW() &gt;= plan.plan_start_time AND NOW() &lt; plan.plan_stop_time, 3, 4)
-           )
-        ) AS planState
+      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)
+    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
   </select>
 
@@ -337,4 +337,18 @@
 
   </select>
 
+  <!--鏍规嵁璁″垝ID鑾峰彇璁″垝璇︽儏锛屽寘鎷鍒掑悕绉帮紝椤圭洰鍚嶏紝璁″垝寮�濮嬫椂闂达紝璁″垝缁撴潫鏃堕棿锛岃鍒掕鎯呴〉浣跨敤-->
+  <select id="getPlanDetails" resultType="com.dy.pipIrrGlobal.voIr.VoPlanDetails">
+    SELECT
+      plan.plan_name AS planName,
+      pro.project_name AS projectName,
+      plan.plan_start_time AS planStartTime,
+      plan.plan_stop_time AS planStopTime,
+      NULL AS groupDetails
+    FROM ir_irrigate_plan plan
+        INNER JOIN ir_project pro ON pro.id = plan.project_id
+    WHERE plan.id = #{planId}
+    AND plan.deleted = 0
+  </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0