rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改准备发货详情的图片从URL改为对象

This commit is contained in:
funny 2026-05-09 08:38:11 +08:00
parent a6bb627c3f
commit e3ff8ca9ff
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiInspectionResultsControllerService.java
View File

@ -528,18 +528,18 @@ public class QmsPdiInspectionResultsControllerService {
.collect(Collectors.toSet()); .collect(Collectors.toSet());
// 批量查询图片文件信息 // 批量查询图片文件信息
Map<Long, String> imageUrlMap = new HashMap<>(); Map<Long, FileUploadRecord> fileRecordMap = new HashMap<>();
if (!allImageIds.isEmpty()) { if (!allImageIds.isEmpty()) {
List<FileUploadRecord> fileRecords = fileUploadRecordService.lambdaQuery() List<FileUploadRecord> fileRecords = fileUploadRecordService.lambdaQuery()
.in(FileUploadRecord::getId, allImageIds) .in(FileUploadRecord::getId, allImageIds)
.list(); .list();
imageUrlMap = fileRecords.stream() fileRecordMap = fileRecords.stream()
.collect(Collectors.toMap(FileUploadRecord::getId, FileUploadRecord::getUrl, (a, b) -> a)); .collect(Collectors.toMap(FileUploadRecord::getId, r -> r, (a, b) -> a));
} }
// 构建返回列表 // 构建返回列表
Map<Long, QmsPdiDetectionRulesDeliveryItem> finalDeliveryItemMap = deliveryItemMap; Map<Long, QmsPdiDetectionRulesDeliveryItem> finalDeliveryItemMap = deliveryItemMap;
Map<Long, String> finalImageUrlMap = imageUrlMap; Map<Long, FileUploadRecord> finalFileRecordMap = fileRecordMap;
List<QmsPdiTaskRecordDetailVO.DeliveryItemDetailVO> detailList = new ArrayList<>(); List<QmsPdiTaskRecordDetailVO.DeliveryItemDetailVO> detailList = new ArrayList<>();
for (QmsPdiInspectionResults r : results) { for (QmsPdiInspectionResults r : results) {
QmsPdiTaskRecordDetailVO.DeliveryItemDetailVO vo = new QmsPdiTaskRecordDetailVO.DeliveryItemDetailVO(); QmsPdiTaskRecordDetailVO.DeliveryItemDetailVO vo = new QmsPdiTaskRecordDetailVO.DeliveryItemDetailVO();
@ -551,17 +551,25 @@ public class QmsPdiInspectionResultsControllerService {
vo.setChecklist(di.getChecklist()); vo.setChecklist(di.getChecklist());
} }
// inspectionItemImage 按逗号拆分，将ID转换为URL // inspectionItemImage 按逗号拆分，将ID转换为FileDetailVO列表
String imageStr = r.getInspectionItemImage(); String imageStr = r.getInspectionItemImage();
if (StrUtil.isNotBlank(imageStr)) { if (StrUtil.isNotBlank(imageStr)) {
List<String> imageUrls = Arrays.stream(imageStr.split(",")) List<QmsPdiTaskRecordDetailVO.FileDetailVO> imageDetails = Arrays.stream(imageStr.split(","))
.map(String::trim) .map(String::trim)
.filter(StrUtil::isNotBlank) .filter(StrUtil::isNotBlank)
.map(Long::valueOf) .map(Long::valueOf)
.map(finalImageUrlMap::get) .map(finalFileRecordMap::get)
.filter(Objects::nonNull) .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()); .collect(Collectors.toList());
vo.setInspectionItemImage(imageUrls); vo.setInspectionItemImage(imageDetails);
} else { } else {
vo.setInspectionItemImage(List.of()); vo.setInspectionItemImage(List.of());
} }

4
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDetailVO.java
View File

@ -128,8 +128,8 @@ public class QmsPdiTaskRecordDetailVO {
private String checklist; private String checklist;
/** /**
* 现场图片/视频URL列表 * 现场图片/视频详情列表
*/ */
private List<String> inspectionItemImage; private List<FileDetailVO> inspectionItemImage;
} }
} }