From 1e3eeec2d3a470d066d21900586b912dfef58c91 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 15:07:41 +0800
Subject: [PATCH] 优化代码
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 d127b5d..5121d98 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -320,7 +320,12 @@
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,
+ <!--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
--
Gitblit v1.8.0