mozhe
/
demo
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

任务列表bug修复

This commit is contained in:
cjw 2024-02-23 11:12:09 +08:00
parent 58c18f886c
commit b383e4a1e6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java
View File

@ -86,9 +86,15 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService {
MesPlanDetailVo planVo = res.get(i); MesPlanDetailVo planVo = res.get(i);
Long id = planVo.getId(); Long id = planVo.getId();
List<MesPlanRecordVo> detailRecord = recordCollect.get(id); List<MesPlanRecordVo> detailRecord = recordCollect.get(id);
Map<String, List<MesPlanRecordVo>> collect = detailRecord.stream().collect(Collectors.groupingBy(MesPlanRecordVo::getFlag, Collectors.toList())); List<MesPlanRecordVo> plan = new ArrayList<>();
List<MesPlanRecordVo> actual = new ArrayList<>();
if (CollUtil.isNotEmpty(detailRecord)) {
Map<String, List<MesPlanRecordVo>> collect = detailRecord.stream().collect(Collectors.groupingBy(MesPlanRecordVo::getFlag, Collectors.toList()));
plan = collect.get("plan");
actual = collect.get("actual");
}
planVo.setFlag("plan"); planVo.setFlag("plan");
planVo.setRecord(collect.get("plan")); planVo.setRecord(plan);
data.add(planVo); data.add(planVo);
// 处理实际数据 // 处理实际数据
MesPlanDetailVo actualVo = new MesPlanDetailVo(); MesPlanDetailVo actualVo = new MesPlanDetailVo();
@ -97,7 +103,7 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService {
actualVo.setParentId(planVo.getParentId()); actualVo.setParentId(planVo.getParentId());
actualVo.setMainId(planVo.getMainId()); actualVo.setMainId(planVo.getMainId());
actualVo.setFlag("actual"); actualVo.setFlag("actual");
actualVo.setRecord(collect.get("actual")); actualVo.setRecord(actual);
data.add(actualVo); data.add(actualVo);
} }
return data; return data;