From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
index f6025e0..1440ce8 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
@@ -38,7 +38,7 @@
<select id="queryRunTimes" resultType="com.mes.largenscreen.entity.RunTime">
with edg_storage_cage_history_task_temp as (
select distinct create_time from edg_storage_device_task_history where task_type in (1,3) and
- create_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 DAY)
+ create_time LIKE '%${days}%'
)
SELECT
t1.create_time AS first_timestamp,
@@ -64,6 +64,22 @@
GROUP BY t1.create_time,t2.create_time
;
</select>
-
+ <select id="queryEdgDailyProduction" resultMap="baseMap">
+ SELECT
+ count( t.glass_id_out ) AS count_out_one,
+ round( sum( t1.width * t1.height )/ 1000000, 2 ) AS total_area_out_one
+ FROM
+ edg_storage_device_task_history t
+ INNER JOIN glass_info t1 ON t.glass_id_out = t1.glass_id
+ WHERE
+ t.task_type IN ( 2, 3 )
+ <if test="beginDate != null and beginDate != ''">
+ AND STR_TO_DATE( t.create_time, '%Y-%m-%d' ) BETWEEN #{beginDate}
+ AND #{endDate}
+ </if>
+ <if test="deviceId != null and deviceId != 0">
+ AND device_id = #{deviceId}
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0