From e4aa9db5e3c91c969adf2361f8069b8c54244e1a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 15 四月 2025 12:02:39 +0800
Subject: [PATCH] 获取轮灌组详情接口，对轮灌组增加终止状态判断

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml |    8 +++++---
 1 files changed, 5 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..059fcf8 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,

--
Gitblit v1.8.0