diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java index c3e9f30..e5aa96d 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java @@ -86,9 +86,15 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService { MesPlanDetailVo planVo = res.get(i); Long id = planVo.getId(); List detailRecord = recordCollect.get(id); - Map> collect = detailRecord.stream().collect(Collectors.groupingBy(MesPlanRecordVo::getFlag, Collectors.toList())); + List plan = new ArrayList<>(); + List actual = new ArrayList<>(); + if (CollUtil.isNotEmpty(detailRecord)) { + Map> collect = detailRecord.stream().collect(Collectors.groupingBy(MesPlanRecordVo::getFlag, Collectors.toList())); + plan = collect.get("plan"); + actual = collect.get("actual"); + } planVo.setFlag("plan"); - planVo.setRecord(collect.get("plan")); + planVo.setRecord(plan); data.add(planVo); // 处理实际数据 MesPlanDetailVo actualVo = new MesPlanDetailVo(); @@ -97,7 +103,7 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService { actualVo.setParentId(planVo.getParentId()); actualVo.setMainId(planVo.getMainId()); actualVo.setFlag("actual"); - actualVo.setRecord(collect.get("actual")); + actualVo.setRecord(actual); data.add(actualVo); } return data;