rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

原始BOM-反查

This commit is contained in:
大米 2024-02-25 17:48:21 +08:00
parent 7baf801d81
commit 820d7496e7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/OriginalBomQuery.java
View File

@ -31,7 +31,7 @@ public class OriginalBomQuery {
/** /**
* 报表结果 * 报表结果
*/ */
@Getter
private List<ReverseReportVO> reportResult = new ArrayList<>(); private List<ReverseReportVO> reportResult = new ArrayList<>();
private RedisService redisService = SpringUtil.getBean(RedisService.class); private RedisService redisService = SpringUtil.getBean(RedisService.class);
@ -43,12 +43,13 @@ public class OriginalBomQuery {
} }
public void report() { public List<ReverseReportVO> report() {
if (queryParam.getQueryType().equals(ReportConstant.QueryTypeEnum.SINGLE.getValue())) { if (queryParam.getQueryType().equals(ReportConstant.QueryTypeEnum.SINGLE.getValue())) {
singleLevelReport(); singleLevelReport();
} else { } else {
multipleLevelReport(ImmutableList.of(queryParam.getDrawingNo())); multipleLevelReport(ImmutableList.of(queryParam.getDrawingNo()));
} }
return reportResult;
} }
/** /**
@ -74,8 +75,8 @@ public class OriginalBomQuery {
drawingNos.forEach(k -> { drawingNos.forEach(k -> {
List<ReverseReportVO> drawingParents = parentList.stream().filter(u -> u.getChildDrawingNo().equals(k)).collect(Collectors.toList()); List<ReverseReportVO> drawingParents = parentList.stream().filter(u -> u.getChildDrawingNo().equals(k)).collect(Collectors.toList());
Map<String, List<ReverseReportVO>> nMap = ListCommonUtil.listGroupMap(drawingParents, ReverseReportVO::getDrawingNo); Map<String, List<ReverseReportVO>> nMap = ListCommonUtil.listGroupMap(drawingParents, ReverseReportVO::getDrawingNo);
nMap.keySet().forEach(u->{ nMap.keySet().forEach(u -> {
if(resultMap.containsKey(k)) { if (resultMap.containsKey(k)) {
nMap.get(u).addAll(resultMap.get(k)); nMap.get(u).addAll(resultMap.get(k));
} }
resultMap.put(u, nMap.get(u)); resultMap.put(u, nMap.get(u));
@ -84,8 +85,7 @@ public class OriginalBomQuery {
}); });
List<String> dawNos = parentList.stream().map(u -> u.getDrawingNo()).distinct().collect(Collectors.toList()); List<String> dawNos = parentList.stream().map(u -> u.getDrawingNo()).distinct().collect(Collectors.toList());
multipleLevelReport(dawNos); multipleLevelReport(dawNos);
} } else {
else {
resultMap.forEach((k, v) -> { resultMap.forEach((k, v) -> {
reportResult.addAll(v); reportResult.addAll(v);
}); });