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 |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 5f7f422..059fcf8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -231,6 +231,7 @@
   <select id="getSimpleGroupCount" resultType="java.lang.Long">
     SELECT COUNT(*) AS recordCount
     FROM ir_irrigate_group grp
+        LEFT JOIN ir_project_group pg ON pg.group_id = grp.id
     <where>
       AND grp.deleted = 0
       <if test="projectId != null">
@@ -244,14 +245,15 @@
 
   <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇杞亴缁勫垪琛�-->
   <select id="getSimpleGroups" resultType="com.dy.pipIrrGlobal.voIr.VoGroupSimple">
-    SELECT
+    SELECT DISTINCT
         grp.id AS groupId,
         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
-        INNER JOIN ir_project_group pg ON pg.group_id = grp.id
+        LEFT JOIN ir_project_group pg ON pg.group_id = grp.id
     <where>
       AND grp.deleted = 0
 
@@ -294,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