rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

巡检任务查看修改

This commit is contained in:
yf001217 2026-06-14 16:31:38 +08:00
parent e8dbe61a3d
commit e711478212
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1886,31 +1886,7 @@ public class QmsIssueTicketControllerService {
// 判断是否为工单创建者
boolean isCreator = ticket.getCreateUserId() != null && ticket.getCreateUserId().equals(currentUserId);
List<QmsIssueTicketProcess> processes = new ArrayList<>();
if (CollectionUtil.isNotEmpty(processes)) {
Long temporaryTypeId = dictionaryItemService.getId("工单解决措施", "临时纠正措施");
Long permanentTypeId = dictionaryItemService.getId("工单解决措施", "永久纠正措施");
List<Long> processIds = processes.stream()
.map(QmsIssueTicketProcess::getId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
if (temporaryTypeId != null && CollectionUtil.isNotEmpty(processIds)) {
List<QmsIssueTicketProcessMeasure> temporaryMeasures = issueTicketProcessMeasureService.lambdaQuery()
.in(QmsIssueTicketProcessMeasure::getIssueTicketProcessId, processIds)
.eq(QmsIssueTicketProcessMeasure::getMeasureTypeId, temporaryTypeId)
.list();
convertToMeasureVO(temporaryMeasures);
}
if (permanentTypeId != null && CollectionUtil.isNotEmpty(processIds)) {
List<QmsIssueTicketProcessMeasure> permanentMeasures = issueTicketProcessMeasureService.lambdaQuery()
.in(QmsIssueTicketProcessMeasure::getIssueTicketProcessId, processIds)
.eq(QmsIssueTicketProcessMeasure::getMeasureTypeId, permanentTypeId)
.list();
convertToMeasureVO(permanentMeasures);
}
}
List<QmsIssueTicketProcess> processes;
if (isCreator) {
// 工单创建者：返回全部处理记录