From 6c5f9e53002416b90518e7908fa92dd78ca51162 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 19 Mar 2024 10:46:13 +0800 Subject: [PATCH] =?UTF-8?q?jx=20mes=20=E8=8A=82=E6=8B=8D=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/jx/SxWorkCellTaktCollectRecordService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/SxWorkCellTaktCollectRecordService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/SxWorkCellTaktCollectRecordService.java index 3cc189c..babbada 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/SxWorkCellTaktCollectRecordService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/SxWorkCellTaktCollectRecordService.java @@ -18,6 +18,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -32,6 +33,7 @@ import java.util.stream.Collectors; * @USER: xinwang.yi * @DATE: 2023-12-05 14:21 */ +@Slf4j @Service public class SxWorkCellTaktCollectRecordService implements ISxWorkCellTaktCollectRecordService { @@ -111,8 +113,7 @@ public class SxWorkCellTaktCollectRecordService implements ISxWorkCellTaktCollec workCellList = workCellList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getSeq()))).sorted(Comparator.comparing(MesWorkCell::getSeq).thenComparing(MesWorkCell::getWorkCellCode)).collect(Collectors.toList()); for (MesWorkCell workCell : workCellList) { List recordDbList2Cell = recordDbMap2Cell.get(workCell); - if (CollectionUtils.isEmpty(recordDbMap2Cell)) continue; - + if (CollectionUtils.isEmpty(recordDbList2Cell)) continue; statistics = recordDbList2Cell.stream().filter(o -> null != o).mapToDouble(o -> new Double(o.getWorkTakt())).summaryStatistics(); JxCellTaktReportModel result = new JxCellTaktReportModel(model.getOrganizeCode(), model.getWorkCenterCode(), workCell.getWorkCellCode()); result.setCreateDatetimeStart(model.getCreateDatetimeStart());