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 c71222ab..1155f804 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 @@ -1181,6 +1181,7 @@ public class QmsIssueTicketControllerService { vo.setProjectNo(ticket.getProjectNo()); vo.setIncidentType(ticket.getIncidentType()); vo.setExceptionCode(ticket.getExceptionCode()); + vo.setImpactQuantity(ticket.getImpactQuantity()); vo.setSourceType(ticket.getSourceType()); vo.setCreateUserName(ticket.getCreateUserName()); vo.setCreateTime(ticket.getCreateTime()); @@ -1479,6 +1480,21 @@ public class QmsIssueTicketControllerService { filteredTaskResultIds ); } + + issueTicketToDoService.lambdaUpdate() + .eq(QmsIssueTicketToDo::getTicketId, entity.getId()) + .eq(QmsIssueTicketToDo::getHandlerUserId, entity.getCreateUserId()) + .eq(QmsIssueTicketToDo::getHasProcessed, false) + .set(QmsIssueTicketToDo::getHasProcessed, true) + .update(); + + issueTicketService.lambdaUpdate() + .eq(QmsIssueTicket::getId, entity.getId()) + .set(QmsIssueTicket::getStatus, (short) 1) + .set(QmsIssueTicket::getUpdateUserId, userId) + .set(QmsIssueTicket::getUpdateUserName, userName) + .set(QmsIssueTicket::getUpdateTime, now) + .update(); } private void addIssueTicketProcessAndTodo(Long issueTicketId, Long handlerUserId, List taskResultIds) { @@ -3345,7 +3361,11 @@ public class QmsIssueTicketControllerService { .set(QmsIssueTicket::getUpdateTime, now) .update(); - issueTicketToDoService.processed(ticket.getId()); + issueTicketToDoService.lambdaUpdate() + .eq(QmsIssueTicketToDo::getTicketId, ticket.getId()) + .eq(QmsIssueTicketToDo::getHasProcessed, false) + .set(QmsIssueTicketToDo::getHasProcessed, true) + .update(); // PDI工单关闭时:创建新任务单,复制内容,不合格项改为合格 if (ticket.getSourceType() != null && ticket.getSourceType() == 1 && ticket.getSourceId() != null) {