Merge remote-tracking branch 'origin/master'

zhoushihao

2025-04-14 e42b239ac2c2a922172badbe32afaa4ba4f615f8

 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}