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

refactor(service): 优化工单创建与不合格项描述逻辑 

- 将工单创建方法中HandlerItem对象构造改为显式设置属性，提升代码可读性
- 修改不合格项描述拼接逻辑，使用备注字段替代原有检测内容和结果
- 在流程控制服务类中添加对Map类的导入，为后续逻辑扩展做准备
This commit is contained in:
funny 2026-05-09 10:52:47 +08:00
parent 4995607ae2
commit 2ed8705bf2
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,14 +94,21 @@ public class QmsIssueTicketControllerService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public QmsPdiCreateTicketResultVO createAndQueryPdiTicket(@Valid QmsPdiCreateAndQueryTicketQO request) { public QmsPdiCreateTicketResultVO createAndQueryPdiTicket(@Valid QmsPdiCreateAndQueryTicketQO request) {
// 1. 创建工单 // 1. 创建工单
addPdiTicket(new QmsIssueTicketPdiAddQO() QmsIssueTicketPdiAddQO addQO = new QmsIssueTicketPdiAddQO();
.setTaskRecordId(request.getTaskRecordId()) addQO.setTaskRecordId(request.getTaskRecordId());
.setIncidentType(request.getIncidentType()) addQO.setIncidentType(request.getIncidentType());
.setHandlers(request.getHandlers().stream()
.map(h -> new QmsIssueTicketPdiAddQO.HandlerItem() List<QmsIssueTicketPdiAddQO.HandlerItem> handlerItems = request.getHandlers().stream()
.setTaskResultId(h.getTaskResultId()) .map(h -> {
.setHandlerUserId(h.getHandlerUserId())) QmsIssueTicketPdiAddQO.HandlerItem item = new QmsIssueTicketPdiAddQO.HandlerItem();
.collect(Collectors.toList()))); item.setTaskResultId(h.getTaskResultId());
item.setHandlerUserId(h.getHandlerUserId());
return item;
})
.collect(Collectors.toList());
addQO.setHandlers(handlerItems);
addPdiTicket(addQO);
// 2. 查询该任务的不合格检测项 // 2. 查询该任务的不合格检测项
List<QmsPdiInspectionResultVO> unqualifiedItems = initiatePdiTicket(request.getTaskRecordId()); List<QmsPdiInspectionResultVO> unqualifiedItems = initiatePdiTicket(request.getTaskRecordId());
@ -338,9 +345,8 @@ public class QmsIssueTicketControllerService {
descBuilder.append("；"); descBuilder.append("；");
} }
descBuilder.append(index).append(". "); descBuilder.append(index).append(". ");
descBuilder.append(result.getInspectionContent() != null ? result.getInspectionContent() : ""); // 使用备注字段作为不合格项描述
descBuilder.append("："); descBuilder.append(result.getRemark() != null ? result.getRemark() : "");
descBuilder.append(result.getInspectionResult() != null ? result.getInspectionResult() : "");
index++; index++;
} }
incidentDescription = descBuilder.toString(); incidentDescription = descBuilder.toString();

1
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java
View File

@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;