编号规则变更

zss

2024-09-19 23875dab418476d3b01bbd784a161c9f2b6b6ea1

 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,19 @@
    @Override
    public List<StandardProductList> selectStandardProductList(InsSample insSample) {
        String[] models = insSample.getModel().split("-(?=[^-]*$)");//拆分最后一个【-】
        List<StandardProductList> list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0]);
        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(" - ");
@@ -118,6 +122,10 @@
                return false;
            }
            return true;
        }).map(standardProductList -> {
            String code = baseMapper.selectStandardMethodById(standardProductList.getStandardMethodListId());
            standardProductList.setMethodS(code);
            return standardProductList;
        }).collect(Collectors.toList());
        return list;
    }
@@ -271,7 +279,7 @@
            int retryCount = 0;
            while (!success && retryCount < 100) {
                try {
                    standardProductListService2.saveBatch(list.stream().map(a -> {
                    standardProductListService2.saveOrUpdateBatch(list.stream().map(a -> {
                        a.setFactory(trees[0]);
                        a.setLaboratory(trees[1]);
                        a.setSampleType(trees[2]);
@@ -280,7 +288,6 @@
                        a.setStandardMethodListId(id);
                        return a;
                    }).collect(Collectors.toList()));
                    ;
                    success = true;
                } catch (Exception e) {
                    retryCount++;