| | |
|---|
| | | @Override |
|---|
| | | public IPage<SgProjectInfoDO> queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO) { |
|---|
| | | List<SgProjectInfoDO> sgProjectInfoDOS = baseMapper.queryPageList(page,searchDTO); |
|---|
| | | List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO)); |
|---|
| | | /*List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO)); |
|---|
| | | if (CollectionUtils.isNotEmpty(projectProgress)){ |
|---|
| | | Map<Long, String> progressMap = projectProgress.stream().filter(s->s.getProjectProgress()!=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress)); |
|---|
| | | sgProjectInfoDOS.forEach(s->{ |
|---|
| | | s.setProjectProgress(progressMap.get(s.getId())); |
|---|
| | | }); |
|---|
| | | } |
|---|
| | | }*/ |
|---|
| | | return page.setRecords(sgProjectInfoDOS); |
|---|
| | | } |
|---|
| | | |
|---|
| | |
|---|
| | | * @return |
|---|
| | | */ |
|---|
| | | @NotNull |
|---|
| | | private List<SgProjectInfoDO> getProjectProgress(List<SgProjectInfoVO> list) { |
|---|
| | | public List<SgProjectInfoDO> getProjectProgress(List<SgProjectInfoVO> list) { |
|---|
| | | //项目分组 |
|---|
| | | Map<Long, List<SgProjectInfoVO>> projectMap = list.stream().collect(Collectors.groupingBy(SgProjectInfoVO::getId)); |
|---|
| | | List<SgProjectInfoDO> result = new ArrayList<>(); |
|---|
