zouyu
6 天以前 3793ba4a9b6be8faa6df0d4a76c06763ac03f873
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -180,11 +180,14 @@
        Integer isCheck = insOrderPlanDTO.getIsCheck();
        insOrderPlanDTO.setIsCheck(null);
        String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//试验室
        QueryWrapper<InsOrderPlanDTO> queryWrapper = QueryWrappers.queryWrappers(insOrderPlanDTO);
        if(ObjectUtils.isEmpty(insOrderPlanDTO.getTypeSource())){
            queryWrapper.isNull("ifs_inventory_id");//委托试验查询非ifs报检订单
        }else{
            queryWrapper.isNotNull("ifs_inventory_id");
        Integer typeSource = insOrderPlanDTO.getTypeSource();
        QueryWrapper<InsOrderPlanDTO> queryWrapper = new QueryWrapper<>();
        if(ObjectUtils.isNotEmpty(typeSource)){
            insOrderPlanDTO.setTypeSource(null);
            queryWrapper = QueryWrappers.queryWrappers(insOrderPlanDTO)
                    .eq(!Objects.equals(-1,typeSource),"type_source",typeSource)
                    .isNotNull(!Objects.equals(-1,typeSource),"ifs_inventory_id")
                    .isNull(Objects.equals(-1,typeSource),"ifs_inventory_id");//委托试验查询非ifs报检订单
        }
        IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page,
                queryWrapper,