根据工单id查询报工数据返回不合格处理

huminmin

4 小时以前 039201538c28a0f64858acd12e108345fc1c88c1

根据工单id查询报工数据返回不合格处理

 src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java

@@ -67,5 +67,7 @@
    // 其他数据
    private String otherData;


    // 不合格处理结果
    @ApiModelProperty(value = "不合格处理结果")
    private String dealResult;
}

 src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java

@@ -378,6 +378,55 @@

    @Override
    public List<ProductionProductMainDto> getByProductWorkOrderId(Long productWorkOrderId) {
        return productionProductMainMapper.getByProductWorkOrderId(productWorkOrderId);
        List<ProductionProductMainDto> productionProductMainDtos = productionProductMainMapper.getByProductWorkOrderId(productWorkOrderId);
        
        if (productionProductMainDtos == null || productionProductMainDtos.isEmpty()) {
            return productionProductMainDtos;
        }
        
        // 收集所有产品主记录ID
        List<Long> productMainIds = productionProductMainDtos.stream()
                .map(ProductionProductMainDto::getId)
                .collect(Collectors.toList());
        
        // 批量查询所有相关的质检记录
        List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(
                Wrappers.<QualityInspect>lambdaQuery()
                        .in(QualityInspect::getProductMainId, productMainIds)
        );
        
        if (!qualityInspects.isEmpty()) {
            // 收集所有质检记录ID
            List<Long> inspectIds = qualityInspects.stream()
                    .map(QualityInspect::getId)
                    .collect(Collectors.toList());
            
            // 批量查询所有相关的不合格处理记录
            List<QualityUnqualified> qualityUnqualifieds = qualityUnqualifiedMapper.selectList(
                    Wrappers.<QualityUnqualified>lambdaQuery()
                            .in(QualityUnqualified::getInspectId, inspectIds)
            );
            
            // 构建质检ID到不合格处理记录的映射
            Map<Long, QualityUnqualified> inspectIdToUnqualifiedMap = qualityUnqualifieds.stream()
                    .collect(Collectors.toMap(QualityUnqualified::getInspectId, q -> q, (q1, q2) -> q1));
            
            // 构建产品主ID到质检记录的映射
            Map<Long, QualityInspect> productMainIdToInspectMap = qualityInspects.stream()
                    .collect(Collectors.toMap(QualityInspect::getProductMainId, q -> q, (q1, q2) -> q1));
            
            // 关联处理结果到产品主记录
            productionProductMainDtos.forEach(p -> {
                QualityInspect qualityInspect = productMainIdToInspectMap.get(p.getId());
                if (qualityInspect != null) {
                    QualityUnqualified qualityUnqualified = inspectIdToUnqualifiedMap.get(qualityInspect.getId());
                    if (qualityUnqualified != null) {
                        p.setDealResult(qualityUnqualified.getDealResult() == null ? "" : qualityUnqualified.getDealResult());
                    }
                }
            });
        }
        
        return productionProductMainDtos;
    }
}