From d799fbde44cc568a3e15d78dc6e582ff244ffa89 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 29 三月 2025 16:05:44 +0800
Subject: [PATCH] 1、卧式理片重置任务调整，避免无任务情况下无法将任务交互表的数据清掉 2、中空领取任务界面新增产品名称，便于识别产品 3、调整部分定时任务间隔时间 4、定时任务分隔开，按照两个/多个界面的websocket由一个分为多个 5、取消钢化功能开发中z
---
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