diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiInspectionResultsControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiInspectionResultsControllerService.java index 207e4049..175c151a 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiInspectionResultsControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiInspectionResultsControllerService.java @@ -528,18 +528,18 @@ public class QmsPdiInspectionResultsControllerService { .collect(Collectors.toSet()); // 批量查询图片文件信息 - Map imageUrlMap = new HashMap<>(); + Map fileRecordMap = new HashMap<>(); if (!allImageIds.isEmpty()) { List fileRecords = fileUploadRecordService.lambdaQuery() .in(FileUploadRecord::getId, allImageIds) .list(); - imageUrlMap = fileRecords.stream() - .collect(Collectors.toMap(FileUploadRecord::getId, FileUploadRecord::getUrl, (a, b) -> a)); + fileRecordMap = fileRecords.stream() + .collect(Collectors.toMap(FileUploadRecord::getId, r -> r, (a, b) -> a)); } // 构建返回列表 Map finalDeliveryItemMap = deliveryItemMap; - Map finalImageUrlMap = imageUrlMap; + Map finalFileRecordMap = fileRecordMap; List detailList = new ArrayList<>(); for (QmsPdiInspectionResults r : results) { QmsPdiTaskRecordDetailVO.DeliveryItemDetailVO vo = new QmsPdiTaskRecordDetailVO.DeliveryItemDetailVO(); @@ -551,17 +551,25 @@ public class QmsPdiInspectionResultsControllerService { vo.setChecklist(di.getChecklist()); } - // inspectionItemImage 按逗号拆分,将ID转换为URL + // inspectionItemImage 按逗号拆分,将ID转换为FileDetailVO列表 String imageStr = r.getInspectionItemImage(); if (StrUtil.isNotBlank(imageStr)) { - List imageUrls = Arrays.stream(imageStr.split(",")) + List imageDetails = Arrays.stream(imageStr.split(",")) .map(String::trim) .filter(StrUtil::isNotBlank) .map(Long::valueOf) - .map(finalImageUrlMap::get) + .map(finalFileRecordMap::get) .filter(Objects::nonNull) + .map(file -> { + QmsPdiTaskRecordDetailVO.FileDetailVO fileVO = new QmsPdiTaskRecordDetailVO.FileDetailVO(); + fileVO.setId(file.getId()); + fileVO.setFileName(file.getFileName()); + fileVO.setFileType(file.getFileType()); + fileVO.setUrl(file.getUrl()); + return fileVO; + }) .collect(Collectors.toList()); - vo.setInspectionItemImage(imageUrls); + vo.setInspectionItemImage(imageDetails); } else { vo.setInspectionItemImage(List.of()); } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDetailVO.java index 0f93a154..317198e1 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDetailVO.java @@ -128,8 +128,8 @@ public class QmsPdiTaskRecordDetailVO { private String checklist; /** - * 现场图片/视频URL列表 + * 现场图片/视频详情列表 */ - private List inspectionItemImage; + private List inspectionItemImage; } }