Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-23 924d018e6e6f15effbd272cead5dff67cd3b93a5

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

@@ -1,10 +1,9 @@
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.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.mapper.MaterialMapper;
@@ -17,14 +16,11 @@
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 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 +102,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());