diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java index ac6f367e..4bd3f6ae 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java @@ -303,8 +303,8 @@ public class QmsPdiStatusItemControllerService { */ private PageData buildStatusItemPage( Long detectionRulesId, int status, int pageNum, int pageSize, Boolean isAsc) { - // 获取排序方向(默认降序) - boolean ascending = isAsc != null && isAsc; + // 获取排序方向(默认升序) + boolean ascending = isAsc == null || isAsc; Page page = statusItemService.lambdaQuery() .eq(QmsPdiDetectionRulesStatusItem::getDetectionRulesId, detectionRulesId) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java index b92f9eba..b6da8ab3 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java @@ -164,8 +164,22 @@ public class QmsPdiTaskRecordControllerService { .collect(Collectors.toMap(QmsPdiDetectionRulesStatusItem::getId, si -> si, (a, b) -> a)); } + // 批量收集所有示例图ID,查询对应的URL + Set imageIds = statusItemMap.values().stream() + .map(QmsPdiDetectionRulesStatusItem::getInspectionImage) + .filter(id -> id != null && !id.isEmpty()) + .map(Long::parseLong) + .collect(Collectors.toSet()); + Map imageUrlMap = Map.of(); + if (!imageIds.isEmpty()) { + List imageFiles = fileUploadRecordService.listByIds(imageIds); + imageUrlMap = imageFiles.stream() + .collect(Collectors.toMap(FileUploadRecord::getId, FileUploadRecord::getUrl, (a, b) -> a)); + } + // 映射 Map finalStatusMap = statusItemMap; + Map finalImageUrlMap = imageUrlMap; List voList = records.stream().map(r -> { QmsPdiTaskRecordDetailVO.StatusItemVO vo = new QmsPdiTaskRecordDetailVO.StatusItemVO(); vo.setId(r.getId()); @@ -173,8 +187,15 @@ public class QmsPdiTaskRecordControllerService { if (si != null) { vo.setComponentsDes(si.getComponentsDes()); vo.setInspectionContent(si.getInspectionContent()); - // inspectionImage 已经是URL,直接使用 - vo.setInspectionImage(si.getInspectionImage()); + // inspectionImage 是文件ID,需要转换为URL + if (si.getInspectionImage() != null && !si.getInspectionImage().isEmpty()) { + try { + Long imageId = Long.parseLong(si.getInspectionImage()); + vo.setInspectionImage(finalImageUrlMap.get(imageId)); + } catch (NumberFormatException e) { + vo.setInspectionImage(null); + } + } } // 现场图已经是List,无需转换(在下一步处理) vo.setInspectionItemImage(convertImageIdsToVO(r.getInspectionItemImage())); @@ -218,8 +239,22 @@ public class QmsPdiTaskRecordControllerService { .collect(Collectors.toMap(QmsPdiDetectionRulesStatusItem::getId, si -> si, (a, b) -> a)); } + // 批量收集所有示例图ID,查询对应的URL + Set imageIds = statusItemMap.values().stream() + .map(QmsPdiDetectionRulesStatusItem::getInspectionImage) + .filter(id -> id != null && !id.isEmpty()) + .map(Long::parseLong) + .collect(Collectors.toSet()); + Map imageUrlMap = Map.of(); + if (!imageIds.isEmpty()) { + List imageFiles = fileUploadRecordService.listByIds(imageIds); + imageUrlMap = imageFiles.stream() + .collect(Collectors.toMap(FileUploadRecord::getId, FileUploadRecord::getUrl, (a, b) -> a)); + } + // 映射 Map finalStatusMap = statusItemMap; + Map finalImageUrlMap = imageUrlMap; return records.stream().map(r -> { QmsPdiTaskRecordDetailVO.StatusItemVO vo = new QmsPdiTaskRecordDetailVO.StatusItemVO(); vo.setId(r.getId()); @@ -227,8 +262,15 @@ public class QmsPdiTaskRecordControllerService { if (si != null) { vo.setComponentsDes(si.getComponentsDes()); vo.setInspectionContent(si.getInspectionContent()); - // inspectionImage 已经是URL,直接使用 - vo.setInspectionImage(si.getInspectionImage()); + // inspectionImage 是文件ID,需要转换为URL + if (si.getInspectionImage() != null && !si.getInspectionImage().isEmpty()) { + try { + Long imageId = Long.parseLong(si.getInspectionImage()); + vo.setInspectionImage(finalImageUrlMap.get(imageId)); + } catch (NumberFormatException e) { + vo.setInspectionImage(null); + } + } } vo.setInspectionItemImage(convertImageIdsToVO(r.getInspectionItemImage())); vo.setInspectionBy(r.getInspectionBy()); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiStatusItemSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiStatusItemSearchQO.java index 0a72f782..7170e93d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiStatusItemSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiStatusItemSearchQO.java @@ -32,7 +32,7 @@ public class QmsPdiStatusItemSearchQO { private Integer status; /** - * 是否升序:true=升序,false=降序(默认降序) + * 是否升序:true=升序(默认),false=降序 */ - private Boolean isAsc = false; + private Boolean isAsc = true; }