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 | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 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 1eb144e..059fcf8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -230,22 +230,8 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇杞亴缁勮褰曟暟-->
<select id="getSimpleGroupCount" resultType="java.lang.Long">
SELECT COUNT(*) AS recordCount
-<!-- 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>-->
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
<if test="projectId != null">
@@ -259,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
@@ -304,4 +291,21 @@
) 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(sche.current_state = 2, 5,
+ IF(NOW() < sche.start_time, 2,
+ IF(NOW() > sche.start_time AND NOW() < 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