From b63eef2cfb054b1ead234ab93e05a2aa28775d91 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:54:26 +0800
Subject: [PATCH] 优化灌溉计划发布前判断条件

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
index ec4bb00..5121d98 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -250,7 +250,8 @@
         grp.group_code AS groupCode,
         (SELECT COUNT(*) FROM ir_group_intake WHERE group_id = grp.id) AS intakeCount,
         grp.default_duration AS defaultDuration,
-        0 as sort
+        0 as sort,
+        grp.operate_time
     FROM ir_irrigate_group grp
         LEFT JOIN ir_project_group pg ON pg.group_id = grp.id
     <where>
@@ -295,8 +296,9 @@
     SELECT
         grp.id AS groupId,
         grp.group_code AS groupCode,
-        IF(NOW() &lt; sche.start_time, 2,
-        IF(NOW() > sche.start_time AND NOW() &lt; DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), 3, 4)) AS state,
+        IF(sche.current_state = 2, 5,
+            IF(NOW() &lt; sche.start_time, 2,
+                IF(NOW() > sche.start_time AND NOW() &lt; DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), 3, 4))) AS state,
         sche.start_time AS startTime,
         DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE) AS stopTime,
         sche.duration,
@@ -305,5 +307,29 @@
         INNER JOIN ir_irrigate_schedule sche ON sche.group_id = grp.id
         INNER JOIN ir_plan_schedule ps ON ps.schedule_id = sche.id
     WHERE ps.plan_id = #{planId};
+
+  </select>
+
+  <!--鏍规嵁鐏屾簤璁″垝ID鑾峰彇杞亴缁勭粓姝㈢粨鏋�-->
+  <select id="getGroupResult_terminate" resultType="com.dy.pipIrrGlobal.voIr.VoGroupResult">
+    SELECT
+        grp.id AS groupId,
+        grp.group_code AS groupCode,
+        IF(#{terminateTime} &lt; sche.start_time, 6,
+            IF(#{terminateTime} &lt; DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), 5, 4)) AS state,
+        IF(#{terminateTime} > sche.start_time, sche.start_time, NULL) AS startTime,
+            IF(#{terminateTime} > DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE),
+                IF(#{terminateTime} > sche.start_time, #{terminateTime}, NULL)) AS stopTime,
+        <!--sche.duration,-->
+        TIMESTAMPDIFF(MINUTE,
+            IF('2025-04-15 15:27' > sche.start_time, sche.start_time, NULL),
+            IF('2025-04-15 15:27' > DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE),
+                IF('2025-04-15 15:27' > sche.start_time, '2025-04-15 15:27', NULL))
+        ) AS duration,
+        NULL AS publishResult
+    FROM ir_irrigate_group  grp
+        INNER JOIN ir_irrigate_schedule sche ON sche.group_id = grp.id
+        INNER JOIN ir_plan_schedule ps ON ps.schedule_id = sche.id
+    WHERE ps.plan_id = #{planId}
   </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0