pqc示例图返回值修改
This commit is contained in:
parent
8913b8d94b
commit
a221c38fcf
|
|
@ -613,9 +613,9 @@ public class QmsIssueTicketControllerService {
|
|||
itemVO.setInspectionContent(finalItemMap.get(detail.getInspectionPointItemId()) != null
|
||||
? finalItemMap.get(detail.getInspectionPointItemId()).getInspectionContent()
|
||||
: null);
|
||||
itemVO.setInspectionExampleFiles(finalItemMap.get(detail.getInspectionPointItemId()) != null
|
||||
? parseCommonFileList(finalItemMap.get(detail.getInspectionPointItemId()).getInspectionImgUrl(), fileMap)
|
||||
: List.of());
|
||||
itemVO.setInspectionExampleImage(finalItemMap.get(detail.getInspectionPointItemId()) != null
|
||||
? parseFirstFileUrl(finalItemMap.get(detail.getInspectionPointItemId()).getInspectionImgUrl(), fileMap)
|
||||
: null);
|
||||
itemVO.setSelfTestData(detail.getSelfTestData());
|
||||
itemVO.setSelfTestFiles(parseCommonFileList(detail.getSelfTestAttachments(), fileMap));
|
||||
itemVO.setSelfTesterName(taskRecord.getSelfTesterName());
|
||||
|
|
@ -2567,6 +2567,22 @@ public class QmsIssueTicketControllerService {
|
|||
.forEach(collector::add);
|
||||
}
|
||||
|
||||
private String parseFirstFileUrl(String fileIdsStr, Map<Long, FileUploadRecord> fileMap) {
|
||||
if (StrUtil.isBlank(fileIdsStr)) {
|
||||
return null;
|
||||
}
|
||||
return Arrays.stream(fileIdsStr.split(","))
|
||||
.filter(StrUtil::isNotBlank)
|
||||
.map(String::trim)
|
||||
.map(Long::valueOf)
|
||||
.map(fileMap::get)
|
||||
.filter(Objects::nonNull)
|
||||
.map(FileUploadRecord::getUrl)
|
||||
.filter(StrUtil::isNotBlank)
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 转换措施列表
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@ public class QmsPqcCreateTicketUnqualifiedItemVO {
|
|||
private String inspectionContent;
|
||||
|
||||
/**
|
||||
* 检测示例附件
|
||||
* 检测示例
|
||||
*/
|
||||
private List<CommonFileDetailVO> inspectionExampleFiles;
|
||||
private String inspectionExampleImage;
|
||||
|
||||
/**
|
||||
* 自检数据
|
||||
|
|
|
|||
Loading…
Reference in New Issue