|
@ -3473,7 +3473,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit |
|
|
//3-1.查询分类信息
|
|
|
//3-1.查询分类信息
|
|
|
IssueProjectCategoryDictListFormDTO dictFormDto = new IssueProjectCategoryDictListFormDTO(); |
|
|
IssueProjectCategoryDictListFormDTO dictFormDto = new IssueProjectCategoryDictListFormDTO(); |
|
|
dictFormDto.setCustomerId(formDTO.getCustomerId()); |
|
|
dictFormDto.setCustomerId(formDTO.getCustomerId()); |
|
|
Result<List<IssueProjectCategoryDictDTO>> categoryRes = govIssueOpenFeignClient.coutomerCategoryList(dictFormDto); |
|
|
Result<List<IssueProjectCategoryDictDTO>> categoryRes = govIssueOpenFeignClient.getCategoryList(dictFormDto); |
|
|
if (!categoryRes.success() || org.springframework.util.CollectionUtils.isEmpty(categoryRes.getData())) { |
|
|
if (!categoryRes.success() || org.springframework.util.CollectionUtils.isEmpty(categoryRes.getData())) { |
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取项目分类名称异常"); |
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取项目分类名称异常"); |
|
|
} |
|
|
} |
|
@ -3507,10 +3507,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (!org.springframework.util.CollectionUtils.isEmpty(dto.getUrlList())) { |
|
|
if (!org.springframework.util.CollectionUtils.isEmpty(dto.getUrlList())) { |
|
|
//String imageUrl = StringUtils.join(dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList()),String.valueOf((char)10));
|
|
|
String imageUrl = StringUtils.join(dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList())," <br/> "); |
|
|
String imageUrl = StringUtils.join(dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList()),"\n"); |
|
|
|
|
|
System.out.println(imageUrl |
|
|
|
|
|
); |
|
|
|
|
|
dto.setImageUrl(imageUrl); |
|
|
dto.setImageUrl(imageUrl); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|