报表推送修改

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()
+                                    double averageActualEmployment =Math.round(list.stream()
-                                            .collect(Collectors.averagingDouble(H5::getActualEmployment));
+                                            .collect(Collectors.averagingDouble(H5::getActualEmployment)));
                                     H5 resultH5 = new H5();
                                     resultH5.setWorkOrderCode(list.get(0).getWorkOrderCode()); // 设置 workOrderCode
                                     resultH5.setActualEmployment(averageActualEmployment);

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
     </select>