From 2ed8705bf224803f0595bf1d1f270e12794290fc Mon Sep 17 00:00:00 2001
From: funny <834502597@qq.com>
Date: Sat, 9 May 2026 10:52:47 +0800
Subject: [PATCH] =?UTF-8?q?refactor(service):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=88=9B=E5=BB=BA=E4=B8=8E=E4=B8=8D=E5=90=88?=
 =?UTF-8?q?=E6=A0=BC=E9=A1=B9=E6=8F=8F=E8=BF=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将工单创建方法中HandlerItem对象构造改为显式设置属性，提升代码可读性
- 修改不合格项描述拼接逻辑，使用备注字段替代原有检测内容和结果
- 在流程控制服务类中添加对Map类的导入，为后续逻辑扩展做准备
---
 .../QmsIssueTicketControllerService.java      | 28 +++++++++++--------
 ...msIssueTicketProcessControllerService.java |  1 +
 2 files changed, 18 insertions(+), 11 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 7751694c..c5fe4188 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
@@ -94,14 +94,21 @@ public class QmsIssueTicketControllerService {
     @Transactional(rollbackFor = Exception.class)
     public QmsPdiCreateTicketResultVO createAndQueryPdiTicket(@Valid QmsPdiCreateAndQueryTicketQO request) {
         // 1. 创建工单
-        addPdiTicket(new QmsIssueTicketPdiAddQO()
-                .setTaskRecordId(request.getTaskRecordId())
-                .setIncidentType(request.getIncidentType())
-                .setHandlers(request.getHandlers().stream()
-                        .map(h -> new QmsIssueTicketPdiAddQO.HandlerItem()
-                                .setTaskResultId(h.getTaskResultId())
-                                .setHandlerUserId(h.getHandlerUserId()))
-                        .collect(Collectors.toList())));
+        QmsIssueTicketPdiAddQO addQO = new QmsIssueTicketPdiAddQO();
+        addQO.setTaskRecordId(request.getTaskRecordId());
+        addQO.setIncidentType(request.getIncidentType());
+        
+        List<QmsIssueTicketPdiAddQO.HandlerItem> handlerItems = request.getHandlers().stream()
+                .map(h -> {
+                    QmsIssueTicketPdiAddQO.HandlerItem item = new QmsIssueTicketPdiAddQO.HandlerItem();
+                    item.setTaskResultId(h.getTaskResultId());
+                    item.setHandlerUserId(h.getHandlerUserId());
+                    return item;
+                })
+                .collect(Collectors.toList());
+        addQO.setHandlers(handlerItems);
+        
+        addPdiTicket(addQO);
 
         // 2. 查询该任务的不合格检测项
         List<QmsPdiInspectionResultVO> unqualifiedItems = initiatePdiTicket(request.getTaskRecordId());
@@ -338,9 +345,8 @@ public class QmsIssueTicketControllerService {
                     descBuilder.append("；");
                 }
                 descBuilder.append(index).append(". ");
-                descBuilder.append(result.getInspectionContent() != null ? result.getInspectionContent() : "");
-                descBuilder.append("：");
-                descBuilder.append(result.getInspectionResult() != null ? result.getInspectionResult() : "");
+                // 使用备注字段作为不合格项描述
+                descBuilder.append(result.getRemark() != null ? result.getRemark() : "");
                 index++;
             }
             incidentDescription = descBuilder.toString();
diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java
index 1d4bd8e9..bc7eb299 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java
@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;