From 84b970ab181c876314a9b01c065a52a4324b5df8 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 26 三月 2025 16:45:39 +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 |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 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 7f5b8fc..699d758 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
@@ -267,4 +267,42 @@
     WHERE id = #{planId}
   </update>
 
+  <!--鑾峰彇鏈畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�-->
+  <select id="getNotCompletePlans" resultType="com.dy.pipIrrGlobal.voIr.VoPlans">
+    SELECT
+      id AS planId,
+      plan_name AS planName,
+      startup_mode AS startupMode,
+      plan_start_time AS planStartTime,
+      plan_stop_time AS planStopTime,
+      duration,
+      IF(plan_state = 1,'鑽夌',
+         IF(NOW() &lt; plan_start_time, '鏈墽琛�',
+            IF(NOW() &gt;= plan_start_time AND NOW() &lt; plan_stop_time, '鎵ц涓�', '宸插畬鎴�')
+        )
+      ) AS planState
+    FROM ir_irrigate_plan plan
+    WHERE deleted = 0 AND (plan_state = 1 OR NOW() &lt; plan_stop_time)
+    ORDER BY plan_state DESC
+  </select>
+
+  <!--鑾峰彇宸插畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�-->
+  <select id="getCompletedPlans" resultType="com.dy.pipIrrGlobal.voIr.VoPlans">
+    SELECT
+      id AS planId,
+      plan_name AS planName,
+      startup_mode AS startupMode,
+      plan_start_time AS planStartTime,
+      plan_stop_time AS planStopTime,
+      duration,
+      IF(plan_state = 1,'鑽夌',
+         IF(NOW() &lt; plan_start_time, '鏈墽琛�',
+            IF(NOW() &gt;= plan_start_time AND NOW() &lt; plan_stop_time, '鎵ц涓�', '宸插畬鎴�')
+        )
+      ) AS planState
+    FROM ir_irrigate_plan plan
+    WHERE deleted = 0 AND (plan_state = 2 AND NOW() &gt;= plan_stop_time)
+    ORDER BY plan_state DESC
+  </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0