From 8a9afaf8da11dfcf0c86da534bb960970188913d Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Sun, 7 Jul 2024 22:43:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=9F=A5=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/domain/EBom/EBomForwardReport.java  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
index b1da4109..3e294d95 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
@@ -13,10 +13,13 @@ import com.nflg.product.bomnew.constant.EBomConstant;
 import com.nflg.product.bomnew.constant.EBomStatusEnum;
 import com.nflg.product.bomnew.constant.OriginalConstant;
 import com.nflg.product.bomnew.constant.ReportConstant;
+import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity;
+import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildFormalEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentFormalEntity;
 import com.nflg.product.bomnew.pojo.query.ReverseReportQuery;
 import com.nflg.product.bomnew.pojo.vo.*;
+import com.nflg.product.bomnew.service.BomNewEbomChildFormalService;
 import com.nflg.product.bomnew.service.BomNewEbomParentFormalService;
 import com.nflg.product.bomnew.service.BomNewEbomParentService;
 import com.nflg.product.bomnew.service.MaterialMainService;
@@ -114,8 +117,22 @@ public class EBomForwardReport extends BaseForwardReport {
             QueryWrapper<BomNewEbomParentFormalEntity> queryWrapper = new QueryWrapper<>();
             buildQueryParam(queryWrapper);
             List<BomNewEbomParentFormalEntity> list = SpringUtil.getBean(BomNewEbomParentFormalService.class).list(queryWrapper);
+
+//            List<Long> parentIds=list.stream().map(BomNewEbomParentFormalEntity::getRowId).collect(Collectors.toList());
+//            List<BomNewEbomChildFormalEntity > listChild = SpringUtil.getBean(BomNewEbomChildFormalService.class)
+//                    .lambdaQuery().in(BomNewEbomChildFormalEntity::getBomVersionRowId,parentIds).list();
+//            Map<Long, BomNewEbomChildFormalEntity> childMap = ListCommonUtil.listToMap(listChild, BomNewEbomChildFormalEntity::getBomVersionRowId);
+
             rlist = Convert.convert(new TypeReference<List<BomNewEbomParentVO>>() {
             }, list);
+
+//            for( BomNewEbomParentVO parentVO:rlist){
+//                if(Objects.nonNull(childMap)&& childMap.containsKey(parentVO.getRowId())){
+//                    BomNewEbomChildFormalEntity childFormal=childMap.get(parentVO.getRowId());
+//                        parentVO.setProjectType(childFormal.getProjectType());
+//                }
+//            }
+
         }
 
         if (CollUtil.isNotEmpty(rlist)) {