第一次改动(检验任务与样品关联,附件与样品关联,报告与样品关联)

zss

2024-11-21 9f19d3a24f8474bf6f9eb9401888c44b34b381e6

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

@@ -63,6 +63,7 @@
    @Override
    public List<StandardProductList> selectStandardProductList(InsSample insSample) {
        String[] models = insSample.getModel().split("-(?=[^-]*$)");//拆分最后一个【-】
        String[] models1 = insSample.getModel().split(";(?=[^;]*$)");//拆分最后一个【-】
        List<Integer> ids = Arrays.stream(insSample.getStandardMethodListId().split(","))
                .map(String::trim).map(Integer::parseInt).collect(Collectors.toList());
        List<StandardProductList> list = standardProductListMapper.selectDetail(ids, 1, models[0]);
@@ -102,9 +103,16 @@
                        } else {
                            if (sections.get(i).contains("&")) {
                                String[] split = sections.get(i).split("&");
                                isIf = getIsIf(split[0], models[1]) && getIsIf(split[1], models[1]);
                                isIf = getIsIf(split[0], models1[1]) && getIsIf(split[1], models[1].split(";")[0]);
                            } else {
                                isIf = getIsIf(sections.get(i), models[1]);
                                if (ObjectUtils.isNotEmpty(models[1].split(";")[0])){
                                    isIf = getIsIf(sections.get(i), models[1].split(";")[0]);
                                    if (!isIf) {
                                        isIf = getIsIf(sections.get(i), models1[1]);
                                    }
                                }else {
                                    isIf = getIsIf(sections.get(i), models1[1]);
                                }
                            }
                            if (isIf) {
                                a.setSection(sections.get(i));
@@ -127,15 +135,59 @@
            standardProductList.setMethodS(code);
            return standardProductList;
        }).collect(Collectors.toList());
        //按照电路试验--辐射试验--温湿度试验--环境试验进行排序
        // 定义自定义排序器
        Comparator<StandardProductList> testTypeComparator = (o1, o2) -> {
            String[] order = {"电路试验", "辐射试验", "温湿度试验", "环境试验","功率试验"};
            int index1 = -1;
            int index2 = -1;
            // 找出两个对象 在自定义顺序数组中的位置
            for (int i = 0; i < order.length; i++) {
                if (o1.getInspectionItem().equals(order[i])) {
                    index1 = i;
                }
                if (o2.getInspectionItem().equals(order[i])) {
                    index2 = i;
                }
                if (index1 != -1 && index2 != -1) {
                    break; // 两个位置都找到了，可以退出循环
                }
            }
            // 比较位置
            int compareResult = Integer.compare(index1, index2);
            // 如果是环境试验，且两个对象在主检验项目上排序相同，则用次级检验项目排序
            if (compareResult == 0 && order[index1].equals("环境试验")) {
                String[] subOrder = {"冲水试验", "振动试验"};
                int subIndex1 = -1;
                int subIndex2 = -1;
                for (int i = 0; i < subOrder.length; i++) {
                    if (o1.getInspectionItemSubclass().equals(subOrder[i])) {
                        subIndex1 = i;
                    }
                    if (o2.getInspectionItemSubclass().equals(subOrder[i])) {
                        subIndex2 = i;
                    }
                    if (subIndex1 != -1 && subIndex2 != -1) {
                        break; // 两个次级位置都找到了，可以退出循环
                    }
                }
                compareResult = Integer.compare(subIndex1, subIndex2);
            }
            // 比较位置
            return compareResult;
        };
        // 对列表进行排序
        Collections.sort(list, testTypeComparator);
        return list;
    }

    private boolean getIsIf(String str, String model) {
        Matcher matcher = Pattern.compile("\\d+(\\.\\d+)?").matcher(model);
        String model2 = "";
        while (matcher.find()) {
        if (matcher.find()) {
            model2 += matcher.group();
            break;
        }else {
            model2=model;
        }
        if (str.contains("≥") || str.contains(">=")) {
            String param = str.replace("≥", "").replace(">=", "");
@@ -151,7 +203,11 @@
            return new BigDecimal(model2).compareTo(new BigDecimal(param)) < 0;
        } else if (str.contains("=")) {
            String param = str.replace("=", "");
            return new BigDecimal(model2).compareTo(new BigDecimal(param)) == 0;
            if (matcher.find()) {
                return new BigDecimal(model2).compareTo(new BigDecimal(param)) == 0;
            }else {
                return model2.equals(param);
            }
        }
        return false;
    }