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 26e41218..0ae19518 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 @@ -301,18 +301,6 @@ public class QmsIssueTicketProcessControllerService { Long processId = process.getId(); - // 3. 保存数据:前端传入approvalStatus/approvalOpinion,数据库填入leaderApprovalResult/leaderApprovalOpinion - issueTicketProcessService.lambdaUpdate() - .eq(QmsIssueTicketProcess::getId, processId) - .set(request.getApprovalOpinion() != null, - QmsIssueTicketProcess::getLeaderApprovalOpinion, request.getApprovalOpinion()) - .set(request.getApprovalStatus() != null, - QmsIssueTicketProcess::getLeaderApprovalResult, request.getApprovalStatus()) - .set(QmsIssueTicketProcess::getLeaderUserId, currentUserId) - .set(QmsIssueTicketProcess::getLeaderUserName, UserUtil.getUserName()) - .set(QmsIssueTicketProcess::getLeaderApprovalTime, now) - .update(); - issueTicketToDoService.processed(ticket.getId()); Short leaderApprovalResult = request.getApprovalStatus(); @@ -371,6 +359,17 @@ public class QmsIssueTicketProcessControllerService { issueTicketToDoService.save(todoItem); } } else if (leaderApprovalResult == 0) { + // 同意:保存领导审批结果 + issueTicketProcessService.lambdaUpdate() + .eq(QmsIssueTicketProcess::getId, processId) + .set(request.getApprovalOpinion() != null, + QmsIssueTicketProcess::getLeaderApprovalOpinion, request.getApprovalOpinion()) + .set(QmsIssueTicketProcess::getLeaderApprovalResult, request.getApprovalStatus()) + .set(QmsIssueTicketProcess::getLeaderUserId, currentUserId) + .set(QmsIssueTicketProcess::getLeaderUserName, UserUtil.getUserName()) + .set(QmsIssueTicketProcess::getLeaderApprovalTime, now) + .update(); + // 同意:检查同一工单下所有处理记录是否都已完成 Long issueTicketId = process.getIssueTicketId();