From 70b2c7a1f5b54cf9157d8fce4d6a9b0f2fadaebe Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 15 四月 2025 17:13:28 +0800
Subject: [PATCH] 获取终止操作结果

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 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 63e9a5e..94e29d9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
@@ -303,6 +303,15 @@
     ORDER BY plan.plan_state DESC
   </select>
 
+  <!--鑾峰彇宸插畬鎴愮殑璁″垝鏁伴噺-->
+  <select id="getCompletedPlansCount" resultType="java.lang.Long">
+    SELECT
+        COUNT(*) AS recordCount
+    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))
+  </select>
+
   <!--鑾峰彇宸插畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�-->
   <select id="getCompletedPlans" resultType="com.dy.pipIrrGlobal.voIr.VoPlans">
     SELECT
@@ -318,6 +327,11 @@
         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
+    <trim prefix="limit ">
+      <if test="start != null and count != null">
+        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+      </if>
+    </trim>
   </select>
 
   <!--鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈣鍒掔殑缁撴潫鏃堕棿锛氭湭鍒犻櫎銆佹湭缁堟銆佸凡鍙戝竷銆佸綋鍓嶆椂闂村皬浜庤鍒掔粨鏉熸椂闂�-->
@@ -355,6 +369,24 @@
     AND plan.deleted = 0
   </select>
 
+  <!--鏍规嵁璁″垝ID鑾峰彇宸茬粓姝㈣鍒掔殑璇︽儏锛岀粨鏉熸椂闂翠负瀹為檯缁堟鏃堕棿-->
+  <select id="getPlanDetails_terminate" resultType="com.dy.pipIrrGlobal.voIr.VoPlanDetails">
+    SELECT
+        plan.plan_name AS planName,
+        pro.project_name AS projectName,
+        IF(#{terminateTime} &lt; plan.plan_start_time, 6,
+          IF(#{terminateTime} &lt; plan.plan_stop_time, 5, 4)) AS state,
+        plan.plan_start_time AS planStartTime,
+        plan.plan_stop_time AS planStopTime,
+        #{terminateTime} AS realStopTime,
+        NULL AS groupDetails,
+        NULL AS failureCount
+    FROM ir_irrigate_plan plan
+      INNER JOIN ir_project pro ON pro.id = plan.project_id
+    WHERE plan.id =2025041515194900009
+    AND plan.deleted = 0
+  </select>
+
   <!--鏍规嵁璁″垝ID鑾峰彇璁″垝鐘舵�侊紝鐢ㄤ簬鍒ゆ柇鏄惁鍙互鍒犻櫎璁″垝-->
   <select id="getPlanState" resultType="java.lang.Integer">
     SELECT

--
Gitblit v1.8.0