|
@@ -315,6 +315,7 @@ public class DeclaredProjectManage { |
|
|
List<ProjectDraftVO> res = page.getRecords().stream().map(record -> { |
|
|
List<ProjectDraftVO> res = page.getRecords().stream().map(record -> { |
|
|
ProjectDraftVO vo = new ProjectDraftVO(); |
|
|
ProjectDraftVO vo = new ProjectDraftVO(); |
|
|
BeanUtils.copyProperties(record, vo); |
|
|
BeanUtils.copyProperties(record, vo); |
|
|
|
|
|
vo.setBizDomain(Objects.nonNull(record.getBizDomain()) ? String.valueOf(record.getBizDomain()) : StringUtils.EMPTY); |
|
|
return vo; |
|
|
return vo; |
|
|
}).collect(Collectors.toList()); |
|
|
}).collect(Collectors.toList()); |
|
|
return PageVo.of(res, page.getTotal()); |
|
|
return PageVo.of(res, page.getTotal()); |
|
@@ -324,6 +325,7 @@ public class DeclaredProjectManage { |
|
|
ProjectDraft draft = projectDraftService.getById(id); |
|
|
ProjectDraft draft = projectDraftService.getById(id); |
|
|
ProjectDraftVO vo = new ProjectDraftVO(); |
|
|
ProjectDraftVO vo = new ProjectDraftVO(); |
|
|
BeanUtils.copyProperties(draft, vo); |
|
|
BeanUtils.copyProperties(draft, vo); |
|
|
|
|
|
vo.setBizDomain(Objects.nonNull(draft.getBizDomain()) ? String.valueOf(draft.getBizDomain()) : StringUtils.EMPTY); |
|
|
if(StringUtils.isNotBlank(draft.getProjectApplicationList())){ |
|
|
if(StringUtils.isNotBlank(draft.getProjectApplicationList())){ |
|
|
vo.setApplicationList(JSON.parseArray(draft.getProjectApplicationList(),ProjectApplication.class)); |
|
|
vo.setApplicationList(JSON.parseArray(draft.getProjectApplicationList(),ProjectApplication.class)); |
|
|
} |
|
|
} |
|
|