From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 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..5121d98 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() < sche.start_time, 2,
- IF(NOW() > sche.start_time AND NOW() < DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), 3, 4)) AS state,
+ 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,
@@ -304,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} < sche.start_time, 6,
+ IF(#{terminateTime} < 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