chenrui
2025-04-09 73f262d6a15a925ea8f0af1351b907255a4735b5
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -105,7 +105,26 @@
        otherParam.setIsOrderAll(isOrderAll);
        otherParam.setCheckUserFlag(checkUserFlag);
        otherParam.setCheckUserId(SecurityUtils.getUserId());
        return insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), otherParam);
        IPage<SampleOrderDto> sampleOrderDtoIPage = insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), otherParam);
        // 拼接检验人根据检验项来
        if(CollectionUtils.isEmpty(sampleOrderDtoIPage.getRecords())){
            return sampleOrderDtoIPage;
        }
        List<Integer> orderIds = new ArrayList<>();
        for (SampleOrderDto record : sampleOrderDtoIPage.getRecords()) {
            orderIds.add(record.getId());
        }
        List<CheckUserDto> checkUserDtoList = insProductMapper.selectCheckUserNameByOrderIds(orderIds);
        for (SampleOrderDto record : sampleOrderDtoIPage.getRecords()) {
            Integer orderId = record.getId();
            for (CheckUserDto checkUserDto : checkUserDtoList) {
                if(orderId.equals(checkUserDto.getOrderId())) {
                    record.setTestingName(checkUserDto.getCheckUserNames());
                    break;
                }
            }
        }
        return sampleOrderDtoIPage;
    }