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

取消查项目类型

This commit is contained in:
jing's 2024-07-07 22:43:40 +08:00
parent fe3536f13d
commit 8a9afaf8da
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
View File

@ -13,10 +13,13 @@ import com.nflg.product.bomnew.constant.EBomConstant;
import com.nflg.product.bomnew.constant.EBomStatusEnum; import com.nflg.product.bomnew.constant.EBomStatusEnum;
import com.nflg.product.bomnew.constant.OriginalConstant; import com.nflg.product.bomnew.constant.OriginalConstant;
import com.nflg.product.bomnew.constant.ReportConstant; 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.BomNewEbomParentEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentFormalEntity; import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentFormalEntity;
import com.nflg.product.bomnew.pojo.query.ReverseReportQuery; import com.nflg.product.bomnew.pojo.query.ReverseReportQuery;
import com.nflg.product.bomnew.pojo.vo.*; 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.BomNewEbomParentFormalService;
import com.nflg.product.bomnew.service.BomNewEbomParentService; import com.nflg.product.bomnew.service.BomNewEbomParentService;
import com.nflg.product.bomnew.service.MaterialMainService; import com.nflg.product.bomnew.service.MaterialMainService;
@ -114,8 +117,22 @@ public class EBomForwardReport extends BaseForwardReport {
QueryWrapper<BomNewEbomParentFormalEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<BomNewEbomParentFormalEntity> queryWrapper = new QueryWrapper<>();
buildQueryParam(queryWrapper); buildQueryParam(queryWrapper);
List<BomNewEbomParentFormalEntity> list = SpringUtil.getBean(BomNewEbomParentFormalService.class).list(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>>() { rlist = Convert.convert(new TypeReference<List<BomNewEbomParentVO>>() {
}, list); }, 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)) { if (CollUtil.isNotEmpty(rlist)) {