Crunchy
2024-07-04 4696fd707f1c723970eac62d333588b51dffbd2b
检验对象导入完成
已修改4个文件
75 ■■■■ 文件已修改
cnas-server/src/main/java/com/yuanchu/mom/excel/StructureTestObjectData.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-server/src/main/java/com/yuanchu/mom/mapper/ProductMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-server/src/main/java/com/yuanchu/mom/mapper/StructureTestObjectMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-server/src/main/java/com/yuanchu/mom/excel/StructureTestObjectData.java
@@ -6,12 +6,12 @@
@Data
public class StructureTestObjectData {
    @ExcelProperty(value = "场所")
    private String laboratoryId;
    private String laboratory;
    @ExcelProperty(value = "检验对象")
    @ExcelProperty(value = "检测对象")
    private String specimenName;
    @ExcelProperty(value = "检验对象(EN)")
    @ExcelProperty(value = "检测对象(EN)")
    private String specimenNameEn;
    @ExcelProperty(value = "对象代号")
cnas-server/src/main/java/com/yuanchu/mom/mapper/ProductMapper.java
@@ -1,7 +1,7 @@
package com.yuanchu.mom.mapper;
import com.yuanchu.mom.mybatis_config.MyBaseMapper;
import com.yuanchu.mom.pojo.Product;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author z1292
@@ -9,7 +9,7 @@
* @createDate 2024-04-26 01:11:02
* @Entity com.yuanchu.mom.pojo.Product
*/
public interface ProductMapper extends BaseMapper<Product> {
public interface ProductMapper extends MyBaseMapper<Product> {
}
cnas-server/src/main/java/com/yuanchu/mom/mapper/StructureTestObjectMapper.java
@@ -1,11 +1,10 @@
package com.yuanchu.mom.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.PageTestObjectDto;
import com.yuanchu.mom.pojo.StructureItemParameter;
import com.yuanchu.mom.mybatis_config.MyBaseMapper;
import com.yuanchu.mom.pojo.StructureTestObject;
/**
@@ -14,7 +13,7 @@
 * @author makejava
 * @since 2024-02-26 17:36:41
 */
public interface StructureTestObjectMapper extends BaseMapper<StructureTestObject> {
public interface StructureTestObjectMapper extends MyBaseMapper<StructureTestObject> {
    IPage<PageTestObjectDto> selectTestObjectList(Page page, QueryWrapper<PageTestObjectDto> ew);
}
cnas-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
@@ -1,17 +1,26 @@
package com.yuanchu.mom.service.impl;
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.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.excel.StructureTestObjectData;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.ProductMapper;
import com.yuanchu.mom.mapper.StructureTestObjectMapper;
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.pojo.Product;
import com.yuanchu.mom.pojo.StructureTestObject;
import com.yuanchu.mom.service.LaboratoryService;
import com.yuanchu.mom.service.ProductService;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -29,6 +38,10 @@
    private ProductMapper productMapper;
    private GetLook getLook;
    private LaboratoryService laboratoryService;
    private StructureTestObjectMapper structureTestObjectMapper;
    @Override
    public Map<String, Object> selectProductListByObjectId(Page page, Product product) {
@@ -55,9 +68,54 @@
        return productMapper.deleteById(id);
    }
    @Transactional(rollbackFor = Exception.class)
    @Override
    public void importPartExcel(List<StructureTestObjectData> list) {
        System.out.println(list);
        List<StructureTestObject> addList = new ArrayList<>();
        List<StructureTestObject> updateList = new ArrayList<>();
        List<Product> addProductList = new ArrayList<>();
        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::getLaboratoryName, i.getLaboratory()));
            if (ObjectUtils.isEmpty(laboratory)) {
                throw new ErrorException("未找到该场所:" + i.getLaboratory() + ",请检查是否存在该场所!");
            }
            // 如果为空进行新增
            if(ObjectUtils.isEmpty(structureTestObject1)) {
                StructureTestObject structureTestObject = new StructureTestObject();
                structureTestObject.setLaboratoryId(laboratory.getId());
                structureTestObject.setSpecimenName(i.getSpecimenName());
                structureTestObject.setSpecimenNameEn(i.getSpecimenNameEn());
                structureTestObject.setCode(i.getCode());
                addList.add(structureTestObject);
            } else {
                structureTestObject1.setCode(i.getCode());
                structureTestObject1.setLaboratoryId(laboratory.getId());
                updateList.add(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();
                product1.setName(i.getName());
                product1.setNameEn(i.getNameEn());
                addProductList.add(product1);
            }
        });
        addList.forEach(i -> {
            structureTestObjectMapper.insert(i);
        });
        saveBatch(addProductList);
        updateList.forEach(i -> {
            structureTestObjectMapper.updateById(i);
        });
    }
}