Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-a...

chenrui

2025-04-09 1070eb501c0075e3f40f4506c2d9e5ddb9c597b9

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

@@ -4,25 +4,20 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.StructureTestObjectDto;
import com.ruoyi.basic.mapper.*;
import com.ruoyi.basic.service.*;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.dto.ProductDTO1;
import com.ruoyi.basic.excel.StructureTestObjectData;
import com.ruoyi.basic.pojo.*;
import com.ruoyi.common.utils.StringUtils;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

/**
 * @author z1292
 * @description 针对表【product(产品表)】的数据库操作Service实现
@@ -34,8 +29,6 @@
    implements ProductService{

    private ProductMapper productMapper;

    private LaboratoryService laboratoryService;

    private StructureTestObjectMapper structureTestObjectMapper;

@@ -129,91 +122,6 @@
                .eq(ProductPart::getProductId, id));

        return productMapper.deleteById(id);
    }

    @Transactional(rollbackFor = Exception.class)
    @Override
    public void importPartExcel(List<StructureTestObjectData> list) {
        list.forEach(i -> {
            // 检验对象
            StructureTestObject structureTestObject1 = structureTestObjectMapper.selectOne(Wrappers.<StructureTestObject>lambdaQuery()
                    .eq(StructureTestObject::getSpecimenName, i.getSpecimenName())
                    .eq(StructureTestObject::getSpecimenNameEn, i.getSpecimenNameEn()));
//            Laboratory laboratory = laboratoryService.getOne(Wrappers.<Laboratory>lambdaQuery()
//                    .eq(Laboratory::getId, i.getLaboratory()));
//            if (ObjectUtils.isEmpty(laboratory)) {
//                throw new BaseException("未找到该场所：" + i.getLaboratory() + "，请检查是否存在该场所！");
//            }
            // 如果为空进行新增
            if (ObjectUtils.isEmpty(structureTestObject1)) {
                StructureTestObject structureTestObject = new StructureTestObject();
                structureTestObject.setLaboratoryId(9);
                structureTestObject.setSpecimenName(i.getSpecimenName());
                structureTestObject.setSpecimenNameEn(i.getSpecimenNameEn());
                structureTestObject.setCode(i.getCode());
                structureTestObject.setWorkShopName("");
                structureTestObjectMapper.insert(structureTestObject);

                // 产品
                Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
                        .eq(Product::getName, i.getName())
                        .eq(Product::getNameEn, i.getNameEn()));
                if (ObjectUtils.isEmpty(product)) {
                    Product product1 = new Product();
                    product1.setName(i.getName());
                    product1.setNameEn(i.getNameEn());
                    if (StringUtils.isNotEmpty(i.getWorkShopName())) {
                        WorkShop workShop = workShopMapper.selectOne(Wrappers.<WorkShop>lambdaQuery().eq(WorkShop::getName, i.getWorkShopName()));
                        if (workShop == null){
                            throw new BaseException("请先维护车间信息");
                        }else {
                            product1.setWorkShopId(workShop.getId());
                        }
                    }
                    product1.setWorkShopName(i.getWorkShopName());
                    product1.setObjectId(structureTestObject.getId());
                    baseMapper.insert(product1);
                }
            } else {
                structureTestObject1.setCode(i.getCode());
                structureTestObject1.setLaboratoryId(9);
                structureTestObjectMapper.updateById(structureTestObject1);
                // 产品
                Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
                        .eq(Product::getName, i.getName())
                        .eq(Product::getNameEn, i.getNameEn()));
                if (ObjectUtils.isEmpty(product)) {
                    Product product1 = new Product();
                    if (StringUtils.isNotEmpty(i.getWorkShopName())) {
                        WorkShop workShop =  workShopMapper.selectOne(Wrappers.<WorkShop>lambdaQuery().eq(WorkShop::getName, i.getWorkShopName()));
                        if (workShop == null){
                            throw new BaseException("请先维护车间信息");
                        }else {
                            product1.setWorkShopId(workShop.getId());
                        }
                    }
                    product1.setWorkShopName(i.getWorkShopName());
                    product1.setName(i.getName());
                    product1.setNameEn(i.getNameEn());
                    product1.setObjectId(structureTestObject1.getId());
                    baseMapper.insert(product1);
                } else {
                    if (StringUtils.isNotEmpty(i.getWorkShopName())) {
                        WorkShop workShop =  workShopMapper.selectOne(Wrappers.<WorkShop>lambdaQuery().eq(WorkShop::getName, i.getWorkShopName()));
                        if (workShop == null){
                            throw new BaseException("请先维护车间信息");
                        }else {
                            product.setWorkShopId(workShop.getId());
                        }
                    }
                    product.setWorkShopName(i.getWorkShopName());
                    product.setName(i.getName());
                    product.setNameEn(i.getNameEn());
                    product.setObjectId(structureTestObject1.getId());
                    baseMapper.updateById(product);
                }
            }
        });
    }

    @Override