pqc生成工单方法修改
This commit is contained in:
parent
ba3dc35ea1
commit
01b86c2621
|
|
@ -590,10 +590,6 @@ public class QmsIssueTicketControllerService {
|
||||||
unqualifiedDetails.forEach(detail -> {
|
unqualifiedDetails.forEach(detail -> {
|
||||||
collectFileIds(detail.getSelfTestAttachments(), fileIds);
|
collectFileIds(detail.getSelfTestAttachments(), fileIds);
|
||||||
collectFileIds(detail.getReviewAttachments(), fileIds);
|
collectFileIds(detail.getReviewAttachments(), fileIds);
|
||||||
QmsPqcInspectionPointItems item = finalItemMap.get(detail.getInspectionPointItemId());
|
|
||||||
if (item != null) {
|
|
||||||
collectFileIds(item.getInspectionImgUrl(), fileIds);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Map<Long, FileUploadRecord> fileMap = new HashMap<>();
|
Map<Long, FileUploadRecord> fileMap = new HashMap<>();
|
||||||
|
|
@ -2578,10 +2574,13 @@ public class QmsIssueTicketControllerService {
|
||||||
return Arrays.stream(fileIdsStr.split(","))
|
return Arrays.stream(fileIdsStr.split(","))
|
||||||
.filter(StrUtil::isNotBlank)
|
.filter(StrUtil::isNotBlank)
|
||||||
.map(String::trim)
|
.map(String::trim)
|
||||||
.map(Long::valueOf)
|
.map(value -> {
|
||||||
.map(fileMap::get)
|
if (StrUtil.isNumeric(value)) {
|
||||||
.filter(Objects::nonNull)
|
FileUploadRecord record = fileMap.get(Long.valueOf(value));
|
||||||
.map(FileUploadRecord::getUrl)
|
return record == null ? null : record.getUrl();
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
})
|
||||||
.filter(StrUtil::isNotBlank)
|
.filter(StrUtil::isNotBlank)
|
||||||
.findFirst()
|
.findFirst()
|
||||||
.orElse(null);
|
.orElse(null);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue