From e8d466b071f43a41d10e2ed433640bba925626c2 Mon Sep 17 00:00:00 2001 From: funny <834502597@qq.com> Date: Fri, 8 May 2026 18:07:37 +0800 Subject: [PATCH] =?UTF-8?q?refactor(service):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=BE=9D=E8=B5=96=E6=B3=A8=E5=85=A5=E5=92=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 QmsPdiTaskRecord 及 QmsPdiDetectionRules 相关服务替换为 pdiTaskRecordService 和 pdiDetectionRulesService - 修改不合格结果查询逻辑，使用 pdiInspectionResultsService 服务 - 修正状态项查询，使用 pdiStatusItemService 并根据ID进行查询和映射 - 优化集合流操作，使用 collect(Collectors.toList()) 替换过时方法 - 重构文件详情映射逻辑，显式创建 FileDetailVO 对象设置属性 - QmsIssueTicketProcessMeasureControllerService 新增对 STATE 常量和 NflgException 异常的导入支持 --- .../QmsIssueTicketControllerService.java | 35 ++++++++++--------- ...TicketProcessMeasureControllerService.java | 2 ++ 2 files changed, 21 insertions(+), 16 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 8f2b9b5f..68083fb0 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 @@ -501,9 +501,9 @@ public class QmsIssueTicketControllerService { // 查询工单类型：PDI-新机检测 或 PDI-库存检测 if (ticket.getSourceId() != null) { - QmsPdiTaskRecord taskRecord = taskRecordService.getById(ticket.getSourceId()); + QmsPdiTaskRecord taskRecord = pdiTaskRecordService.getById(ticket.getSourceId()); if (taskRecord != null && taskRecord.getDetectionRulesId() != null) { - QmsPdiDetectionRules detectionRules = detectionRulesService.getById(taskRecord.getDetectionRulesId()); + QmsPdiDetectionRules detectionRules = pdiDetectionRulesService.getById(taskRecord.getDetectionRulesId()); if (detectionRules != null && detectionRules.getInspectionType() != null) { String inspectionTypeStr = detectionRules.getInspectionType() == 0 ? "新机检测" : "库存检测"; vo.setTicketType("PDI-" + inspectionTypeStr); @@ -748,9 +748,9 @@ public class QmsIssueTicketControllerService { // 生成主题：机型编号+订单编号+出厂检测/库存检测+检测版本号 if (ticket.getSourceId() != null) { - QmsPdiTaskRecord taskRecord = taskRecordService.getById(ticket.getSourceId()); + QmsPdiTaskRecord taskRecord = pdiTaskRecordService.getById(ticket.getSourceId()); if (taskRecord != null && taskRecord.getDetectionRulesId() != null) { - QmsPdiDetectionRules detectionRules = detectionRulesService.getById(taskRecord.getDetectionRulesId()); + QmsPdiDetectionRules detectionRules = pdiDetectionRulesService.getById(taskRecord.getDetectionRulesId()); if (detectionRules != null) { String inspectionTypeStr = detectionRules.getInspectionType() != null && detectionRules.getInspectionType() == 0 ? "新机检测" : "库存检测"; vo.setTicketTitle(detectionRules.getMachineNo() + "-" + detectionRules.getOrderNo() + "-" + inspectionTypeStr + "-" + detectionRules.getInspectionVersion()); @@ -783,7 +783,7 @@ public class QmsIssueTicketControllerService { .map(Long::valueOf) .collect(Collectors.toList()); - List unqualifiedResults = inspectionResultsService.lambdaQuery() + List unqualifiedResults = pdiInspectionResultsService.lambdaQuery() .in(QmsPdiInspectionResults::getId, resultIds) .eq(QmsPdiInspectionResults::getInspectionItemResults, false) .list(); @@ -791,17 +791,17 @@ public class QmsIssueTicketControllerService { // 查询检测规则状态项（部件描述、检查内容等） Map statusItemMap = new HashMap<>(); if (CollectionUtil.isNotEmpty(unqualifiedResults)) { - List inspectionItemIds = unqualifiedResults.stream() + List statusItemIds = unqualifiedResults.stream() .map(QmsPdiInspectionResults::getInspectionItemId) .filter(Objects::nonNull) .distinct() - .toList(); - if (CollectionUtil.isNotEmpty(inspectionItemIds)) { - List statusItems = detectionRulesStatusItemService.lambdaQuery() - .in(QmsPdiDetectionRulesStatusItem::getInspectionItemId, inspectionItemIds) + .collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(statusItemIds)) { + List statusItems = pdiStatusItemService.lambdaQuery() + .in(QmsPdiDetectionRulesStatusItem::getId, statusItemIds) .list(); statusItemMap = statusItems.stream() - .collect(Collectors.toMap(QmsPdiDetectionRulesStatusItem::getInspectionItemId, item -> item, (a, b) -> a)); + .collect(Collectors.toMap(QmsPdiDetectionRulesStatusItem::getId, item -> item, (a, b) -> a)); } } @@ -814,7 +814,7 @@ public class QmsIssueTicketControllerService { .map(String::trim) .map(Long::valueOf) .distinct() - .toList(); + .collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(allImageIds)) { List fileRecords = fileUploadRecordService.lambdaQuery() .in(FileUploadRecord::getId, allImageIds) @@ -863,10 +863,13 @@ public class QmsIssueTicketControllerService { .map(Long::valueOf) .map(fileUploadRecordMap::get) .filter(Objects::nonNull) - .map(file -> new QmsPdiTaskRecordDetailVO.FileDetailVO() - .setId(file.getId()) - .setUrl(file.getUrl()) - .setFileName(file.getFileName())) + .map(file -> { + QmsPdiTaskRecordDetailVO.FileDetailVO fileVO = new QmsPdiTaskRecordDetailVO.FileDetailVO(); + fileVO.setId(file.getId()); + fileVO.setUrl(file.getUrl()); + fileVO.setFileName(file.getFileName()); + return fileVO; + }) .collect(Collectors.toList()); itemVO.setInspectionItemImage(imageDetails); } diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java index 2a32dfc7..65caee92 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java @@ -1,6 +1,8 @@ package com.nflg.qms.admin.service; import cn.hutool.core.util.StrUtil; +import com.nflg.wms.common.constant.STATE; +import com.nflg.wms.common.exception.NflgException; import com.nflg.wms.common.pojo.qo.QmsIssueTicketProcessDraftQO; import com.nflg.wms.common.pojo.qo.QmsIssueTicketProcessLeaderDraftQO; import com.nflg.wms.common.util.UserUtil;