From 3059430a0db3f75426e435c06090358646fc3792 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 09 十一月 2023 09:11:17 +0800
Subject: [PATCH] Changes11
---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java
index c9aba27..be123fa 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java
+++ b/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 com.chinaztt.ztt.common.core.util.R;
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,17 +63,31 @@
@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){
- Division division = new Division();
+ 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);
+ if(!Objects.isNull(division1)){
+ log.error("閮ㄩ棬缂栧彿閲嶅========銆�"+data.getDivisionNo());
+ continue;
+ }
+ Division division = new Division();
for (int i = 0; i <companyList.size() ; i++) {
if (companyList.get(i).getCompanyName().equals(data.getCompanyName())){
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 ;
--
Gitblit v1.9.3