From 95d8d3df562c8f7fca74ba994cddbbf41564488e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 08 四月 2025 20:08:15 +0800
Subject: [PATCH] 优化未完成计划列表、已完成计划列表接口

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml |   14 +++++++-------
 1 files changed, 7 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..497b2be 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>
 

--
Gitblit v1.8.0