成品检验查询功能开发

chenrui

2025-04-09 00c23dd7d4a8f229d5c7fbe3439c6ea230fa7f48

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java

@@ -91,8 +91,6 @@
    //获取检验下单数据
    @Override
    public IPage<SampleOrderDto> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto) {
        // TODO 针对人员做权限处理 目前先对检验人员做数据处理  如果是检验人员只能查询到检验项目是自己或者订单分派人是自己的订单，不是检验人员的暂时全查
        boolean checkUserFlag = isCheckUser(SecurityUtils.getUserId().intValue());
        String laboratory = null;
        // 判断是否是全部
        String isOrderAll = null;
@@ -103,27 +101,8 @@
        SampleOrderDto otherParam = new SampleOrderDto();
        otherParam.setLaboratory(laboratory);
        otherParam.setIsOrderAll(isOrderAll);
        otherParam.setCheckUserFlag(checkUserFlag);
        otherParam.setCheckUserId(SecurityUtils.getUserId());
        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;
    }

@@ -210,14 +189,14 @@
            auxiliaryOutputWorkingHours.setCheck(userId);//检测人
            auxiliaryOutputWorkingHours.setPrice(insProduct.getPrice());//单价
            auxiliaryOutputWorkingHours.setSampleId(insProduct.getInsSampleId());//样品id
            auxiliaryOutputWorkingHours.setInsProductId(insProduct.getId());//检验项id
            auxiliaryOutputWorkingHours.setInsProductId(Math.toIntExact(insProduct.getId()));//检验项id

            return auxiliaryOutputWorkingHours;
        }).collect(Collectors.toList());

        // 初次分配检验人，各个检验项默认订单的检验人
        List<Integer> insProductIds  = insProductList.stream().map(insproduct -> {
            return insproduct.getId();
            return Math.toIntExact(insproduct.getId());
        }).collect(Collectors.toList());
        if(!CollectionUtils.isEmpty(insProductIds)){
            insProductMapper.batchUpdateInsProductCheckUserId(insProductIds, userId);
@@ -327,7 +306,7 @@
                    ip2.addAll(insProducts);
                }
                for (InsProduct product : ip2) {
                    product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
                    product.setStandardMethodListId(Long.valueOf(a.getInsulating().getStandardMethodListId()));
                }
                addInsProductMethod(a.getId(), ip2);
            }
@@ -345,7 +324,7 @@
                    ip2.addAll(insProducts);
                }
                for (InsProduct product : ip2) {
                    product.setStandardMethodListId(a.getAuxiliaryWireCore().getStandardMethodListId());
                    product.setStandardMethodListId(Long.valueOf(a.getAuxiliaryWireCore().getStandardMethodListId()));
                }
                addInsProductMethod(a.getId(), ip2);
            }
@@ -1055,22 +1034,6 @@
        } catch (IOException e) {
            throw new RuntimeException("导出失败");
        }
    }


    /**
     * 判断是否为检验人员
     * @param userId
     * @return
     */
    public boolean isCheckUser(Integer userId) {
        List<User> userList = userMapper.selectQualityUserList();
        for (User user : userList) {
            if(userId.equals(user.getId())){
                return true;
            }
        }
        return false;
    }

}