nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java

@@ -1491,8 +1491,8 @@ public class QmsIssueTicketControllerService {
         List<QmsPdiTicketMyDetailVO.MeasureVO> permanentMeasures = new ArrayList<>();
 
         // 查询字典项：临时措施和永久措施的类型ID
-        Long temporaryTypeId = dictionaryItemService.getId("工单解决措施", "临时纠正措施");
-        Long permanentTypeId = dictionaryItemService.getId("工单解决措施", "永久纠正措施");
+        Long temporaryTypeId = dictionaryItemService.getIdByCode("MeasureType", "TemporaryCorrectiveMeasures");
+        Long permanentTypeId = dictionaryItemService.getIdByCode("MeasureType", "PermanentCorrectiveMeasures");
 
         for (QmsIssueTicketProcess process : processes) {
             // 提取根本原因

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java

@@ -192,10 +192,7 @@ public class QmsIssueTicketProcessMeasureControllerService {
 
         // 保存临时措施
         if (CollectionUtil.isNotEmpty(temporaryMeasures)) {
-            Long tempTypeId = dictionaryItemService.getId("工单解决措施", "临时纠正措施");
-            if (tempTypeId == null) {
-                throw new NflgException(STATE.BusinessError, "字典【工单解决措施-临时纠正措施】不存在");
-            }
+            Long tempTypeId = dictionaryItemService.getIdByCode("MeasureType", "TemporaryCorrectiveMeasures");
             for (QmsIssueTicketProcessDraftQO.MeasureItem item : temporaryMeasures) {
                 if (StrUtil.isBlank(item.getMeasureContent())) continue;
                 QmsIssueTicketProcessMeasure measure = new QmsIssueTicketProcessMeasure()
@@ -212,10 +209,7 @@ public class QmsIssueTicketProcessMeasureControllerService {
 
         // 保存永久措施
         if (CollectionUtil.isNotEmpty(permanentMeasures)) {
-            Long permTypeId = dictionaryItemService.getId("工单解决措施", "永久纠正措施");
-            if (permTypeId == null) {
-                throw new NflgException(STATE.BusinessError, "字典【工单解决措施-永久纠正措施】不存在");
-            }
+            Long permTypeId = dictionaryItemService.getIdByCode("MeasureType", "PermanentCorrectiveMeasures");
             for (QmsIssueTicketProcessDraftQO.MeasureItem item : permanentMeasures) {
                 if (StrUtil.isBlank(item.getMeasureContent())) continue;
                 QmsIssueTicketProcessMeasure measure = new QmsIssueTicketProcessMeasure()