李林
2024-06-14 681ebad558051dd3b18c379b5c06b23bc08c0761
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -56,6 +56,9 @@
        String[] models = insSample.getModel().split("-(?=[^-]*$)");//拆分最后一个【-】
        List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1).eq(StandardProductList::getModel, models[0]));
        if (list.size() == 0) {
            if(Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null){
                return null;
            }
            String[] split = insSample.getFactory().split(" - ");
            list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
                    .eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId())
@@ -72,19 +75,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;