From a7485c9f9b16ece4f12f0b3f6d6a8c90370f5ae4 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 09 四月 2025 16:08:30 +0800
Subject: [PATCH] 灌溉计划详情信息增加取水口命令发布失败数量

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml |   47 ++++++++++++++++++++++++++---------------------
 1 files changed, 26 insertions(+), 21 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 ae82b5c..ddf5206 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -245,8 +245,12 @@
 <!--      </if>-->
 <!--    </where>-->
     FROM ir_irrigate_group grp
+        INNER JOIN ir_project_group pg ON pg.group_id = grp.id
     <where>
       AND grp.deleted = 0
+      <if test="projectId != null">
+        AND pg.project_id = #{projectId}
+      </if>
       <if test="groupCode != null and groupCode != ''">
         AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%')
       </if>
@@ -255,27 +259,6 @@
 
   <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇杞亴缁勫垪琛�-->
   <select id="getSimpleGroups" resultType="com.dy.pipIrrGlobal.voIr.VoGroupSimple">
-<!--    SELECT-->
-<!--      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,-->
-<!--      pg.sort-->
-<!--    FROM ir_irrigate_group grp-->
-<!--           INNER JOIN ir_project_group pg ON pg.group_id = grp.id-->
-<!--           INNER JOIN ir_project pro ON pg.project_id = pro.id-->
-<!--    <where>-->
-<!--      AND grp.deleted = 0-->
-
-<!--      <if test="projectId != null and projectId != ''">-->
-<!--        AND pro.id = #{projectId}-->
-<!--      </if>-->
-
-<!--      <if test="groupCode != null and groupCode != ''">-->
-<!--        AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%')-->
-<!--      </if>-->
-<!--    </where>-->
-<!--    ORDER BY pg.sort-->
     SELECT
         grp.id AS groupId,
         grp.group_code AS groupCode,
@@ -283,8 +266,14 @@
         grp.default_duration AS defaultDuration,
         0 as sort
     FROM ir_irrigate_group grp
+        INNER JOIN ir_project_group pg ON pg.group_id = grp.id
     <where>
       AND grp.deleted = 0
+
+      <if test="projectId != null">
+        AND pg.project_id = #{projectId}
+      </if>
+
       <if test="groupCode != null and groupCode != ''">
         AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%')
       </if>
@@ -315,4 +304,20 @@
       ) irrigateGroup
     GROUP BY groupCode,defaultDuration
   </select>
+
+  <select id="getGroupResult" resultType="com.dy.pipIrrGlobal.voIr.VoGroupResult">
+    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,
+        sche.start_time AS startTime,
+        DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE) AS stopTime,
+        sche.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