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

@@ -94,21 +94,14 @@ public class QmsIssueTicketControllerService {
     @Transactional(rollbackFor = Exception.class)
     public QmsPdiCreateTicketResultVO createAndQueryPdiTicket(@Valid QmsPdiCreateAndQueryTicketQO request) {
         // 1. 创建工单
-        QmsIssueTicketPdiAddQO addQO = new QmsIssueTicketPdiAddQO();
+        addPdiTicket(new QmsIssueTicketPdiAddQO()
-        addQO.setTaskRecordId(request.getTaskRecordId());
+                .setTaskRecordId(request.getTaskRecordId())
-        addQO.setIncidentType(request.getIncidentType());
+                .setIncidentType(request.getIncidentType())
-        
+                .setHandlers(request.getHandlers().stream()
-        List<QmsIssueTicketPdiAddQO.HandlerItem> handlerItems = request.getHandlers().stream()
+                        .map(h -> new QmsIssueTicketPdiAddQO.HandlerItem()
-                .map(h -> {
+                                .setTaskResultId(h.getTaskResultId())
-                    QmsIssueTicketPdiAddQO.HandlerItem item = new QmsIssueTicketPdiAddQO.HandlerItem();
+                                .setHandlerUserId(h.getHandlerUserId()))
-                    item.setTaskResultId(h.getTaskResultId());
+                        .collect(Collectors.toList())));
-                    item.setHandlerUserId(h.getHandlerUserId());
-                    return item;
-                })
-                .collect(Collectors.toList());
-        addQO.setHandlers(handlerItems);
-        
-        addPdiTicket(addQO);
 
         // 2. 查询该任务的不合格检测项
         List<QmsPdiInspectionResultVO> unqualifiedItems = initiatePdiTicket(request.getTaskRecordId());
@@ -345,8 +338,9 @@ public class QmsIssueTicketControllerService {
                     descBuilder.append("；");
                 }
                 descBuilder.append(index).append(". ");
-                // 使用备注字段作为不合格项描述
+                descBuilder.append(result.getInspectionContent() != null ? result.getInspectionContent() : "");
-                descBuilder.append(result.getRemark() != null ? result.getRemark() : "");
+                descBuilder.append("：");
+                descBuilder.append(result.getInspectionResult() != null ? result.getInspectionResult() : "");
                 index++;
             }
             incidentDescription = descBuilder.toString();

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

@@ -28,7 +28,6 @@ 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;