From 7df8ed14d605bcc731341ff12349bc117714b69e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 16:18:24 +0800
Subject: [PATCH] 优化代码
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 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..4fbefea 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -318,9 +318,14 @@
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(#{terminateTime} > sche.start_time, sche.start_time, NULL),
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,
+ IF(#{terminateTime} > sche.start_time, #{terminateTime}, 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