试验前后样品检查+开始结束时间

zss

2024-10-12 1214b18558c19b09c02161b1dbbef342ad2c1e8f

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

@@ -12,9 +12,11 @@
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.dto.ProductDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.StandardMethodListMapper;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import com.yuanchu.mom.mapper.StandardTreeMapper;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.StandardMethodList;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
import com.yuanchu.mom.service.StandardProductListService;
@@ -61,17 +63,20 @@
    @Override
    public List<StandardProductList> selectStandardProductList(InsSample insSample) {
        String[] models = insSample.getModel().split("-(?=[^-]*$)");//拆分最后一个【-】
        List<StandardProductList> list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0]);
        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]);
        if (list.size() == 0) {
            if (Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null) {
                return null;
            }
            String[] split = insSample.getFactory().split(" - ");
            String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - null";
            list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree);
            list = standardProductListMapper.selectDetail2(ids, 1, tree);
            if (list.size() == 0) {
                String tree1 = split[0] + " - " + split[1] + " - " + split[2] + " - null - " + split[3];
                list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree1);
                list = standardProductListMapper.selectDetail2(ids, 1, tree1);
            }
        }
        String[] split1 = insSample.getFactory().split(" - ");
@@ -98,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));
@@ -118,6 +130,10 @@
                return false;
            }
            return true;
        }).map(standardProductList -> {
            String code = baseMapper.selectStandardMethodById(standardProductList.getStandardMethodListId());
            standardProductList.setMethodS(code);
            return standardProductList;
        }).collect(Collectors.toList());
        return list;
    }
@@ -125,9 +141,10 @@
    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(">=", "");
@@ -143,7 +160,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;
    }