修改bug

Fixiaobai

2023-09-06 8abe275e36823f1065300af45e1f7a9a68f549a7

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

@@ -1,28 +1,21 @@
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.pojo.dto.StandardProductAddDto;
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.Date;
import java.util.List;
import java.util.Map;
import java.util.Objects;


/**
 * <p>
@@ -38,13 +31,10 @@
    @Resource
    private ProductMapper productMapper;

    @Resource
    ProductModelMapper productModelMapper;


    @Override
    public void deleteProductInformation(List<Integer> SpecificationsId) {
        for (Integer materialId : SpecificationsId){
        for (Integer materialId : SpecificationsId) {
            LambdaUpdateWrapper<Product> wrapper = new LambdaUpdateWrapper<>();
            wrapper.eq(Product::getSpecifications_id, materialId);
            wrapper.set(Product::getState, 0);
@@ -52,11 +42,64 @@
        }
    }

    //展示该型号下的检验项目要求-->选择版本
    @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);
    }

    //填写标准值与内控值,鼠标移开保存
    @Override
    public Integer write(Integer id, String required, String internal) {
        Product product = new Product();
        product.setId(id);
        product.setRequired(required);
        product.setInternal(internal);
        MyUtil.PrintLog(product.toString());
        return productMapper.updateById(product);
    }

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

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

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

    @Override
    public String addProduct(StandardProductAddDto dto) {
        int i = productMapper.addProduct(new Product(
                dto.getName(), dto.getFather(),
                dto.getUnit(), new Date(), new Date(),
                Integer.parseInt(dto.getVersion()), dto.getSpecificationId()));
        if(i>0) return "添加成功！";
        return "添加失败";
    }