From a221c38fcf07bd8d540da46a8d688d1426442cc2 Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Fri, 29 May 2026 15:55:30 +0800 Subject: [PATCH] =?UTF-8?q?pqc=E7=A4=BA=E4=BE=8B=E5=9B=BE=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QmsIssueTicketControllerService.java | 22 ++++++++++++++++--- .../QmsPqcCreateTicketUnqualifiedItemVO.java | 4 ++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java index 07cf156b..748e5085 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java @@ -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 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); + } + /** * 转换措施列表 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcCreateTicketUnqualifiedItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcCreateTicketUnqualifiedItemVO.java index 30755452..b28b12f7 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcCreateTicketUnqualifiedItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcCreateTicketUnqualifiedItemVO.java @@ -32,9 +32,9 @@ public class QmsPqcCreateTicketUnqualifiedItemVO { private String inspectionContent; /** - * 检测示例附件 + * 检测示例 */ - private List inspectionExampleFiles; + private String inspectionExampleImage; /** * 自检数据