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 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 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;