成品检验任务功能开发

chenrui

2025-04-11 6d06746ec219cd9660fff07763182c1788ebfb20

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

@@ -91,7 +91,6 @@
    //获取检验下单数据
    @Override
    public IPage<SampleOrderDto> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto) {
        //todo: 只看我判断全部,个人,组织的权限
        String laboratory = null;
        // 判断是否是全部
        String isOrderAll = null;
@@ -99,7 +98,12 @@
            isOrderAll = "1";
            sampleOrderDto.setState(null);
        }
        return insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), laboratory, isOrderAll);
        SampleOrderDto otherParam = new SampleOrderDto();
        otherParam.setLaboratory(laboratory);
        otherParam.setIsOrderAll(isOrderAll);
        otherParam.setCheckUserId(SecurityUtils.getUserId());
        IPage<SampleOrderDto> sampleOrderDtoIPage = insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), otherParam);
        return sampleOrderDtoIPage;
    }


@@ -185,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);
@@ -302,7 +306,7 @@
                    ip2.addAll(insProducts);
                }
                for (InsProduct product : ip2) {
                    product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
                    product.setStandardMethodListId(a.getInsulating().getStandardMethodListIds().toString());
                }
                addInsProductMethod(a.getId(), ip2);
            }
@@ -320,7 +324,7 @@
                    ip2.addAll(insProducts);
                }
                for (InsProduct product : ip2) {
                    product.setStandardMethodListId(a.getAuxiliaryWireCore().getStandardMethodListId());
                    product.setStandardMethodListId(a.getAuxiliaryWireCore().getStandardMethodListId().toString());
                }
                addInsProductMethod(a.getId(), ip2);
            }