标准库添加委托要求功能

chenrui

2025-04-08 afd4b25f5744725c92be40217aae0760289b4671

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java

@@ -5,14 +5,19 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.enums.BasicTreeEnums;
import com.ruoyi.basic.enums.TestPorjectTypeEnums;
import com.ruoyi.basic.mapper.StandardMethodListMapper;
import com.ruoyi.basic.mapper.StandardMethodMapper;
import com.ruoyi.basic.mapper.StandardProductListMapper;
import com.ruoyi.basic.mapper.WorkShopMapper;
import com.ruoyi.basic.pojo.StandardMethod;
import com.ruoyi.basic.pojo.StandardMethodList;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.WorkShop;
import com.ruoyi.basic.service.StandardMethodListService;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -20,6 +25,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
* @author Administrator
@@ -37,6 +43,9 @@

    @Autowired
    private WorkShopMapper workShopMapper;

    @Autowired
    private StandardMethodMapper standardMethodMapper;


    @Override
@@ -103,6 +112,33 @@
                standardMethodListArray = standardMethodListMapper.selectStandardMethodLists(sampleType);
            }
        }
        // 判断是否是成品/半成品
        boolean isProduct = false;
        for (int i = 0; i < trees.length; i++) {
            if(TestPorjectTypeEnums.FINISHED_PRODUCT.getName().equals(trees[i]) || TestPorjectTypeEnums.SEMI_FINISHED_PRODUCT.getName().equals(trees[i])){
                isProduct = true;
                break;
            }
        }
        // 如果是成品/半成品 且 检验标准里不包含委托要求。查询并添加至集合
        boolean isContainDelegateRequest = false;
        for (StandardMethodList standardMethodList : standardMethodListArray) {
            if("委托要求".equals(standardMethodList.getName())){
                isContainDelegateRequest = true;
                break;
            }
        }
        if(isProduct && !isContainDelegateRequest){
            QueryWrapper<StandardMethod> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("name","委托要求");
            queryWrapper.eq("is_use","1");
            List<StandardMethod> standardMethods = standardMethodMapper.selectList(queryWrapper);
            standardMethodListArray.addAll(standardMethods.stream().map(item -> {
                StandardMethodList standardMethodList = new StandardMethodList();
                BeanUtils.copyProperties(item, standardMethodList);
                return standardMethodList;
            }).collect(Collectors.toList()));
        }
        map.put("standardMethodList", standardMethodListArray);
        return map;
    }