Changes14

Fixiaobai

2023-11-16 d8d129a2e41f7099968cb4f4dc1b028ab985135f

 mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java

@@ -23,15 +23,18 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.chinaztt.mes.basic.entity.Company;
import com.chinaztt.mes.basic.entity.Division;
import com.chinaztt.mes.basic.entity.Factory;
import com.chinaztt.mes.basic.excel.DivisionData;
import com.chinaztt.mes.basic.mapper.CompanyMapper;
import com.chinaztt.mes.basic.mapper.DivisionMapper;
import com.chinaztt.mes.basic.mapper.FactoryMapper;
import com.chinaztt.mes.basic.service.DivisionService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * 部门
@@ -43,7 +46,7 @@
@AllArgsConstructor
public class DivisionServiceImpl extends ServiceImpl<DivisionMapper, Division> implements DivisionService {
       private CompanyMapper companyMapper;

      private FactoryMapper factoryMapper;
   /**
     * Description: 分页
     *
@@ -60,11 +63,13 @@

   @Override
   public void importWorkstationExcel(List<DivisionData> list) {
      list.forEach(System.out::println);
      if (CollectionUtil.isEmpty(list)) {
         return;
      }
      List<Company> companyList = companyMapper.selectList(null);
       for (DivisionData data :list){
      List<Factory> factories = factoryMapper.selectList(null);
      for (DivisionData data :list){
          QueryWrapper<Division>QueryWrapper = new QueryWrapper<>();
          QueryWrapper.lambda().eq(Division::getDivisionNo,data.getDivisionNo());
          Division division1 = baseMapper.selectOne(QueryWrapper);
@@ -78,6 +83,11 @@
             division.setCompanyId(companyList.get(i).getId());
            }
         }
         List<Factory> collect = factories.stream().filter(f -> f.getFactoryName().equals(data.getFactoryName())).collect(Collectors.toList());
         if(collect.size() > 0){
            division.setFactoryId(collect.get(0).getId());
            division.setFactoryName(collect.get(0).getFactoryName());
         }
         if (division.getCompanyId()==null){
            log.error("公司:" + data.getCompanyName() + "不存在");
            continue ;