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 8504c33f..bfbff16a 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 @@ -1658,6 +1658,49 @@ public class QmsIssueTicketControllerService { vo.setTemporaryMeasures(temporaryMeasures); vo.setPermanentMeasures(permanentMeasures); + // 填充处理记录列表(含处理人信息) + List processVOs = new ArrayList<>(); + for (QmsIssueTicketProcess process : processes) { + QmsPdiTicketMyDetailVO.ProcessVO pvo = new QmsPdiTicketMyDetailVO.ProcessVO(); + pvo.setId(process.getId()); + pvo.setHandlerUserId(process.getHandlerUserId()); + pvo.setHandlerUserName(process.getHandlerUserName()); + pvo.setRootCause(process.getRootCause()); + pvo.setTaskResultIds(process.getTaskResultIds()); + pvo.setApprovalStatus(process.getApprovalStatus()); + pvo.setApprovalOpinion(process.getApprovalOpinion()); + pvo.setApprovalUserId(process.getApprovalUserId()); + pvo.setApprovalUserName(process.getApprovalUserName()); + pvo.setApprovalTime(process.getApprovalTime()); + pvo.setProcessTime(process.getApprovalTime()); + pvo.setLeaderApprovalResult(process.getLeaderApprovalResult()); + pvo.setLeaderApprovalOpinion(process.getLeaderApprovalOpinion()); + pvo.setLeaderUserId(process.getLeaderUserId()); + pvo.setLeaderUserName(process.getLeaderUserName()); + pvo.setLeaderApprovalTime(process.getLeaderApprovalTime()); + + // 查询该处理记录的措施列表 + List processMeasures = issueTicketProcessMeasureService.lambdaQuery() + .eq(QmsIssueTicketProcessMeasure::getIssueTicketProcessId, process.getId()) + .list(); + List measureVOs = new ArrayList<>(); + for (QmsIssueTicketProcessMeasure m : processMeasures) { + QmsPdiTicketMyDetailVO.MeasureVO mvo = new QmsPdiTicketMyDetailVO.MeasureVO(); + mvo.setId(m.getId()); + mvo.setMeasureTypeId(m.getMeasureTypeId()); + mvo.setMeasureContent(m.getMeasureContent()); + mvo.setChargeUser(m.getChargeUser()); + mvo.setPlanDate(m.getPlanDate()); + mvo.setConfirmDate(m.getConfirmDate()); + mvo.setRemark(m.getRemark()); + measureVOs.add(mvo); + } + pvo.setMeasures(measureVOs); + + processVOs.add(pvo); + } + vo.setProcesses(processVOs); + // 构建相关人员签字(按部门,只返回已审批的) Map signatures = buildSignatures(processes); vo.setSignatures(signatures);