检验单增加外部委托编号+报告批量下载批量上传

zss

2024-08-01 30a143f368dd2ff6e9c27b9d5dd17923ffed03ae

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java

@@ -75,8 +75,14 @@
            }
        }
        String[] split1 = insSample.getFactory().split(" - ");
        //判断长度
        if (split1.length > 3) {
        if (ObjectUtils.isNotEmpty(split1[3])){
            list = list.stream().filter(list1 -> list1.getSample().equals(split1[3])).collect(Collectors.toList());
            }else if (split1[3].equals("")) {
                list = list.stream().filter(list1 -> list1.getSampleType().equals(split1[2])).collect(Collectors.toList());

            }
        }
        list = list.stream().filter(a -> {
            try {
@@ -183,7 +189,8 @@
                list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2, trees[1]));
                list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + standardTree2.getSample() + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2, trees[1]));
            }
        } else if (trees.length == 4) {
        }
        else if (trees.length == 4) {
            List<StandardTree> treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]));
            if (treeList.size() == 0) {
                StandardTree standardTree = new StandardTree();
@@ -198,7 +205,8 @@
                list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str, trees[1]));
                list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", standardTree.getSample(), standardTree.getModel(), str, trees[1]));
            }
        } else {
        }
        else {
            list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", trees[3].equals("null") ? null : trees[3], trees[4], tree, trees[1]));
            list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", trees[3].equals("null") ? null : trees[3], trees[4], tree, trees[1]));
        }
@@ -272,7 +280,8 @@
                            a.setUpdateUser(userId);
                            a.setStandardMethodListId(id);
                            return a;
                        }).collect(Collectors.toList()));;
                    }).collect(Collectors.toList()));
                    ;
                        success = true;
                    } catch (Exception e) {
                        retryCount++;