bug修复

value

2024-06-18 e514d3b363475831841e6240b35795eafebf3ef7

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

@@ -21,6 +21,8 @@
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

/**
@@ -75,19 +77,23 @@
                    List<String> prices = JSON.parseArray(a.getPrice(), String.class);
                    boolean isIf;
                    for (int i = 0; i < sections.size(); i++) {
                        if (sections.get(i).contains("&")) {
                            String[] split = sections.get(i).split("&");
                            isIf = getIsIf(split[0], models[1]) && getIsIf(split[1], models[1]);
                        } else {
                            isIf = getIsIf(sections.get(i), models[1]);
                        }
                        if (isIf) {
                            a.setSection(sections.get(i));
                            a.setAsk(asks.get(i));
                            a.setTell(tells.get(i));
                            a.setPrice(prices.get(i));
                            a.setManHour(manHours.get(i));
                        if(Objects.equals(a.getBsm(), "1")){
                            return true;
                        }else{
                            if (sections.get(i).contains("&")) {
                                String[] split = sections.get(i).split("&");
                                isIf = getIsIf(split[0], models[1]) && getIsIf(split[1], models[1]);
                            } else {
                                isIf = getIsIf(sections.get(i), models[1]);
                            }
                            if (isIf) {
                                a.setSection(sections.get(i));
                                a.setAsk(asks.get(i));
                                a.setTell(tells.get(i));
                                a.setPrice(prices.get(i));
                                a.setManHour(manHours.get(i));
                                return true;
                            }
                        }
                    }
                    return false;
@@ -101,21 +107,26 @@
    }

    private boolean getIsIf(String str, String model){
        Matcher matcher = Pattern.compile("\\d+(\\.\\d+)?").matcher(model);
        String model2 = "";
        while (matcher.find()) {
            model2 += matcher.group();
        }
        if (str.contains("≥") || str.contains(">=")) {
            String param = str.replace("≥", "").replace(">=", "");
            return new BigDecimal(model).compareTo(new BigDecimal(param)) > -1;
            return new BigDecimal(model2).compareTo(new BigDecimal(param)) > -1;
        } else if (str.contains("≤") || str.contains("<=")) {
            String param = str.replace("≤", "").replace("<=", "");
            return new BigDecimal(model).compareTo(new BigDecimal(param)) < 1;
            return new BigDecimal(model2).compareTo(new BigDecimal(param)) < 1;
        } else if (str.contains(">")||str.contains("＞")) {
            String param = str.replace(">", "").replace("＞", "");
            return new BigDecimal(model).compareTo(new BigDecimal(param)) > 0;
            return new BigDecimal(model2).compareTo(new BigDecimal(param)) > 0;
        } else if (str.contains("<")||str.contains("＜")) {
            String param = str.replace("<", "").replace("＜", "");
            return new BigDecimal(model).compareTo(new BigDecimal(param)) < 0;
            return new BigDecimal(model2).compareTo(new BigDecimal(param)) < 0;
        } else if (str.contains("=")) {
            String param = str.replace("=", "");
            return new BigDecimal(model).compareTo(new BigDecimal(param)) == 0;
            return new BigDecimal(model2).compareTo(new BigDecimal(param)) == 0;
        }
        return false;
    }
@@ -163,7 +174,7 @@
        for (StandardProductList sp : standardProductLists) {
            for (StandardProductList pl : list) {
                if (Objects.equals(sp.getInspectionItem(), pl.getInspectionItem())
                        && Objects.equals(sp.getInspectionItemSubclass() == null ? "" : sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass() == null ? "" : pl.getInspectionItemSubclass())
                        && Objects.equals((sp.getInspectionItemSubclass() == null)? "" : sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass() == null ? "" : pl.getInspectionItemSubclass())
                        && Objects.equals(sp.getModel(), pl.getModel())
                        && Objects.equals(sp.getStructureItemParameterId(), pl.getStructureItemParameterId())) {
                    pl.setId(sp.getId());
@@ -201,7 +212,11 @@
        if (page == 1) {
            Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
            CompletableFuture.supplyAsync(() -> {
                standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
                if(trees.length == 5){
                    standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
                }else{
                    standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
                }
                standardProductListService2.saveBatch(list.stream().map(a -> {
                    a.setFactory(trees[0]);
                    a.setLaboratory(trees[1]);