refactor(service): 优化工单创建与不合格项描述逻辑
- 将工单创建方法中HandlerItem对象构造改为显式设置属性,提升代码可读性 - 修改不合格项描述拼接逻辑,使用备注字段替代原有检测内容和结果 - 在流程控制服务类中添加对Map类的导入,为后续逻辑扩展做准备
This commit is contained in:
parent
4995607ae2
commit
2ed8705bf2
|
|
@ -94,14 +94,21 @@ public class QmsIssueTicketControllerService {
|
|||
@Transactional(rollbackFor = Exception.class)
|
||||
public QmsPdiCreateTicketResultVO createAndQueryPdiTicket(@Valid QmsPdiCreateAndQueryTicketQO request) {
|
||||
// 1. 创建工单
|
||||
addPdiTicket(new QmsIssueTicketPdiAddQO()
|
||||
.setTaskRecordId(request.getTaskRecordId())
|
||||
.setIncidentType(request.getIncidentType())
|
||||
.setHandlers(request.getHandlers().stream()
|
||||
.map(h -> new QmsIssueTicketPdiAddQO.HandlerItem()
|
||||
.setTaskResultId(h.getTaskResultId())
|
||||
.setHandlerUserId(h.getHandlerUserId()))
|
||||
.collect(Collectors.toList())));
|
||||
QmsIssueTicketPdiAddQO addQO = new QmsIssueTicketPdiAddQO();
|
||||
addQO.setTaskRecordId(request.getTaskRecordId());
|
||||
addQO.setIncidentType(request.getIncidentType());
|
||||
|
||||
List<QmsIssueTicketPdiAddQO.HandlerItem> handlerItems = request.getHandlers().stream()
|
||||
.map(h -> {
|
||||
QmsIssueTicketPdiAddQO.HandlerItem item = new QmsIssueTicketPdiAddQO.HandlerItem();
|
||||
item.setTaskResultId(h.getTaskResultId());
|
||||
item.setHandlerUserId(h.getHandlerUserId());
|
||||
return item;
|
||||
})
|
||||
.collect(Collectors.toList());
|
||||
addQO.setHandlers(handlerItems);
|
||||
|
||||
addPdiTicket(addQO);
|
||||
|
||||
// 2. 查询该任务的不合格检测项
|
||||
List<QmsPdiInspectionResultVO> unqualifiedItems = initiatePdiTicket(request.getTaskRecordId());
|
||||
|
|
@ -338,9 +345,8 @@ public class QmsIssueTicketControllerService {
|
|||
descBuilder.append(";");
|
||||
}
|
||||
descBuilder.append(index).append(". ");
|
||||
descBuilder.append(result.getInspectionContent() != null ? result.getInspectionContent() : "");
|
||||
descBuilder.append(":");
|
||||
descBuilder.append(result.getInspectionResult() != null ? result.getInspectionResult() : "");
|
||||
// 使用备注字段作为不合格项描述
|
||||
descBuilder.append(result.getRemark() != null ? result.getRemark() : "");
|
||||
index++;
|
||||
}
|
||||
incidentDescription = descBuilder.toString();
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue