From 04aff0d8f9e0dc5663f074f5ac45eac92d3a696a Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Mon, 28 Oct 2024 09:39:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=8E=A8=E9=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/mes/service/impl/H5ApiServiceImpl.java | 4 ++-- op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/H5ApiServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/H5ApiServiceImpl.java index 2b7fd664..c2daca15 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/H5ApiServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/H5ApiServiceImpl.java @@ -79,8 +79,8 @@ public class H5ApiServiceImpl implements H5ApiService { Collectors.collectingAndThen( Collectors.toList(), list -> { - double averageActualEmployment = list.stream() - .collect(Collectors.averagingDouble(H5::getActualEmployment)); + double averageActualEmployment =Math.round(list.stream() + .collect(Collectors.averagingDouble(H5::getActualEmployment))); H5 resultH5 = new H5(); resultH5.setWorkOrderCode(list.get(0).getWorkOrderCode()); // 设置 workOrderCode resultH5.setActualEmployment(averageActualEmployment); diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index 75ff8bd5..2681808e 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -199,7 +199,7 @@ WHERE be.equipment_type_code = 'equ_type_hf' AND del_flag = '0' - ) AS SourceTable PIVOT ( MAX ( isvalue ) FOR property IN ( [dollyNumber], [Intheoven], [temperature] ) ) AS PivotTable LEFT JOIN base_equipment_attached T2 ON PivotTable.equipment_code=T2.device_code WHERE T2.property='dollyNumber' + ) AS SourceTable PIVOT ( MAX ( isvalue ) FOR property IN ( [dollyNumber], [Intheoven], [temperature],,[humidity] ) ) AS PivotTable LEFT JOIN base_equipment_attached T2 ON PivotTable.equipment_code=T2.device_code WHERE T2.property='dollyNumber' ORDER BY i asc