From af0d99c9e7976d2af1f3a1589e0d9e45e97fd41a Mon Sep 17 00:00:00 2001 From: funny <834502597@qq.com> Date: Wed, 13 May 2026 11:09:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=9A=82=E5=AD=98=E5=92=8C?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/QmsIssueTicketControllerService.java | 4 ++-- .../QmsIssueTicketProcessMeasureControllerService.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 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 70b285b1..ebee5439 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 @@ -1475,8 +1475,8 @@ public class QmsIssueTicketControllerService { List permanentMeasures = new ArrayList<>(); // 查询字典项：临时措施和永久措施的类型ID - Long temporaryTypeId = dictionaryItemService.getIdByCode("MeasureType", "TemporaryCorrectiveMeasures"); - Long permanentTypeId = dictionaryItemService.getIdByCode("MeasureType", "PermanentCorrectiveMeasures"); + Long temporaryTypeId = dictionaryItemService.getId("工单解决措施", "临时纠正措施"); + Long permanentTypeId = dictionaryItemService.getId("工单解决措施", "永久纠正措施"); for (QmsIssueTicketProcess process : processes) { // 提取根本原因 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 f0cb5920..c0b5076e 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 @@ -192,7 +192,10 @@ public class QmsIssueTicketProcessMeasureControllerService { // 保存临时措施 if (CollectionUtil.isNotEmpty(temporaryMeasures)) { - Long tempTypeId = dictionaryItemService.getIdByCode("MeasureType", "TemporaryCorrectiveMeasures"); + Long tempTypeId = dictionaryItemService.getId("工单解决措施", "临时纠正措施"); + if (tempTypeId == null) { + throw new NflgException(STATE.BusinessError, "字典【工单解决措施-临时纠正措施】不存在"); + } for (QmsIssueTicketProcessDraftQO.MeasureItem item : temporaryMeasures) { if (StrUtil.isBlank(item.getMeasureContent())) continue; QmsIssueTicketProcessMeasure measure = new QmsIssueTicketProcessMeasure() @@ -209,7 +212,10 @@ public class QmsIssueTicketProcessMeasureControllerService { // 保存永久措施 if (CollectionUtil.isNotEmpty(permanentMeasures)) { - Long permTypeId = dictionaryItemService.getIdByCode("MeasureType", "PermanentCorrectiveMeasures"); + Long permTypeId = dictionaryItemService.getId("工单解决措施", "永久纠正措施"); + if (permTypeId == null) { + throw new NflgException(STATE.BusinessError, "字典【工单解决措施-永久纠正措施】不存在"); + } for (QmsIssueTicketProcessDraftQO.MeasureItem item : permanentMeasures) { if (StrUtil.isBlank(item.getMeasureContent())) continue; QmsIssueTicketProcessMeasure measure = new QmsIssueTicketProcessMeasure()