Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-26 eb34edfc7cf46e5cb5e3969d04315e6129dcbbd2

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java

@@ -1,28 +1,18 @@
package com.yuanchu.limslaboratory.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.mapper.ProductModelMapper;
import com.yuanchu.limslaboratory.mapper.SpecificationsMapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.mapper.ProductMapper;
import com.yuanchu.limslaboratory.pojo.ProductModel;
import com.yuanchu.limslaboratory.service.ProductService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.beans.factory.annotation.Autowired;
import com.yuanchu.limslaboratory.service.UserService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;


/**
 * <p>
@@ -38,9 +28,6 @@
    @Resource
    private ProductMapper productMapper;

    @Resource
    ProductModelMapper productModelMapper;


    @Override
    public void deleteProductInformation(List<Integer> SpecificationsId) {
@@ -52,11 +39,17 @@
        }
    }

    //展示该型号下的检验项目要求-->选择版本
    @Override
    public List<Integer> chooseVersion(Integer specificationsId) {
        return productMapper.chooseVersion(specificationsId);
    }

    //展示该型号下的检验项目要求
    @Override
    @Transactional(rollbackFor = Exception.class)
    public List<Map<String, Object>> pageProductInformation(Integer specificationsId) {
        return productMapper.pageProductInformation(specificationsId);
    public List<Map<String, Object>> pageProductInformation(Integer specificationsId,Integer version) {
        return productMapper.pageProductInformation(specificationsId,version);
    }

    //填写标准值与内控值,鼠标移开保存
@@ -66,8 +59,30 @@
        product.setId(id);
        product.setRequired(required);
        product.setInternal(internal);
        productMapper.updateById(product);
        return 1;
        MyUtil.PrintLog(product.toString());
        return productMapper.updateById(product);
    }

    @Override
    public void deleteList(String ids) {
        productMapper.deleteList(ids);
    }

    //添加同一个型号的其他版本
    @Override
    public Integer addVersion(Integer specificationsId) {
        List<Product> productList = productMapper.selectList(Wrappers.<Product>query().eq("specifications_id", specificationsId));
        for (Product product : productList) {
            product.setVersion(product.getVersion()+1);
        }
         saveBatch(productList);
        return productList.get(0).getVersion();
    }

    //查询该型号下的所有试验项目(父类)
    @Override
    public List<Map<String,Object>> chooseProject(Integer modelId) {
        return productMapper.chooseProject(modelId);
    }