|
@@ -278,7 +278,14 @@ public class ProjectListService {
|
|
|
|
|
|
public ProgramArchiveDto findByIdArchive(String id){
|
|
public ProgramArchiveDto findByIdArchive(String id){
|
|
ProgramArchiveDto programArchiveDto = programArchiveMapper.findByIdArchive(id);
|
|
ProgramArchiveDto programArchiveDto = programArchiveMapper.findByIdArchive(id);
|
|
-
|
|
|
|
|
|
+ if(ObjectUtil.isNotEmpty(programArchiveDto)){
|
|
|
|
+ if(ObjectUtil.isNotEmpty(programArchiveDto.getProgramProjectListInfo())){
|
|
|
|
+ if(StringUtils.isNotBlank(programArchiveDto.getProgramProjectListInfo().getProjectManager())){
|
|
|
|
+ UserDTO userDTO = UserUtils.get(programArchiveDto.getProgramProjectListInfo().getProjectManager());
|
|
|
|
+ programArchiveDto.getProgramProjectListInfo().setOfficeId(userDTO.getOfficeDTO().getName());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
// 查询附件信息 - 评估报告
|
|
// 查询附件信息 - 评估报告
|
|
List<WorkAttachmentDto> reportFileList = workContractInfoMapper.findByAttachmentIdAndFlag(id, "report");
|
|
List<WorkAttachmentDto> reportFileList = workContractInfoMapper.findByAttachmentIdAndFlag(id, "report");
|
|
if (CollectionUtils.isNotEmpty(reportFileList)) {
|
|
if (CollectionUtils.isNotEmpty(reportFileList)) {
|