修改bug

Fixiaobai

2023-09-08 d2ce4553e18131b9a60d7be53c496f0cbce699ca

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

@@ -1,30 +1,25 @@
package com.yuanchu.limslaboratory.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.mapper.ProductModelMapper;
import com.yuanchu.limslaboratory.pojo.Material;
import com.yuanchu.limslaboratory.pojo.*;
import com.yuanchu.limslaboratory.mapper.MaterialMapper;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.Specifications;
import com.yuanchu.limslaboratory.pojo.Standard;
import com.yuanchu.limslaboratory.pojo.dto.AddMaterialDto;
import com.yuanchu.limslaboratory.service.MaterialService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.service.ProductService;
import com.yuanchu.limslaboratory.service.SpecificationsService;
import com.yuanchu.limslaboratory.service.StandardService;
import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.beans.BeanUtils;
import com.yuanchu.limslaboratory.utils.ArrayListUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -106,8 +101,12 @@
                    List<Product> productList = productModel.stream().map(stringObjectMap -> {
                        Product product = new Product();
                        product.setName(stringObjectMap.get("name").toString());
                        product.setFather(stringObjectMap.get("father").toString());
                        product.setUnit(stringObjectMap.get("unit").toString());
                        if (ObjectUtils.isNotEmpty(stringObjectMap.get("father"))) {
                            product.setFather(stringObjectMap.get("father").toString());
                        }
                        if (ObjectUtils.isNotEmpty(stringObjectMap.get("unit"))) {
                            product.setUnit(stringObjectMap.get("unit").toString());
                        }
                        product.setSpecifications_id(specifications.getId());
                        return product;
                    }).collect(Collectors.toList());
@@ -130,5 +129,12 @@
        return productModelMapper.selectmater();
    }

    @Override
    public List<ProductModel> getSample() {
        QueryWrapper<ProductModel>queryWrapper = new QueryWrapper<>();
        queryWrapper.lambda().select(ProductModel::getMaterial,ProductModel::getId).eq(ProductModel::getState,1);
        return ArrayListUtil.oneObjectsDistinctByProperty(ProductModel::getMaterial,productModelMapper.selectList(queryWrapper));
    }


}