From 88cbf1a8c50a15f35dd78a50adc43e71a6530775 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 26 五月 2025 16:22:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml
index 66f2369..275093f 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml
@@ -50,12 +50,14 @@
<select id="queryRunTimes" resultType="com.mes.largenscreen.entity.RunTime">
with big_storage_cage_history_task_temp as (
select distinct create_time from hollow_big_storage_cage_history_task where task_type = 5 and
- create_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 DAY)
+ create_time LIKE '%${days}%'
)
SELECT
t1.create_time AS first_timestamp,
t2.create_time AS second_timestamp,
- TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time) as diff_minutes
+ TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time) as diff_minutes,
+ (select min(create_time) from big_storage_cage_history_task_temp) as start_timestamp
+ ,(select max(create_time) from big_storage_cage_history_task_temp) as end_timestamp
FROM
(SELECT
create_time,
--
Gitblit v1.8.0