From cd7f3fa89aed4e7a4b87c0ee4164cd606103b318 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 15 四月 2025 09:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/LargenScreenMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/LargenScreenMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/LargenScreenMapper.xml
index 4a1d640..14a179a 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/LargenScreenMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/LargenScreenMapper.xml
@@ -33,7 +33,7 @@
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_in = t1.glass_id
+ inner join glass_info t1 on t.glass_id_out = t1.glass_id
where t.task_type in
(2, 3)
and STR_TO_DATE(t.create_time, '%Y-%m-%d') BETWEEN #{beginDate} and #{endDate}
@@ -47,7 +47,7 @@
count_out_two,
round(sum(t1.width * t1.height) / 1000000, 2) as total_area_out_two
from edg_storage_device_task_history t
- inner join glass_info t1 on t.glass_id_in = t1.glass_id
+ inner join glass_info t1 on t.glass_id_out = t1.glass_id
where t.task_type in
(2, 3)
and STR_TO_DATE(t.create_time, '%Y-%m-%d') BETWEEN #{beginDate} and #{endDate}
--
Gitblit v1.8.0