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 queryWrapper = new QueryWrapper<>(); buildQueryParam(queryWrapper); List list = SpringUtil.getBean(BomNewEbomParentFormalService.class).list(queryWrapper); + +// List parentIds=list.stream().map(BomNewEbomParentFormalEntity::getRowId).collect(Collectors.toList()); +// List listChild = SpringUtil.getBean(BomNewEbomChildFormalService.class) +// .lambdaQuery().in(BomNewEbomChildFormalEntity::getBomVersionRowId,parentIds).list(); +// Map childMap = ListCommonUtil.listToMap(listChild, BomNewEbomChildFormalEntity::getBomVersionRowId); + rlist = Convert.convert(new TypeReference>() { }, 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)) {