From 958e45e28ca4f591ab13f2c6f4fe27d57c4880d5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 04 十一月 2023 15:19:31 +0800
Subject: [PATCH] Changes
---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/CrewServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/CrewServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/CrewServiceImpl.java
index eac8a4a..2d82670 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/CrewServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/CrewServiceImpl.java
@@ -3,14 +3,15 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.chinaztt.mes.basic.dto.CrewDTO;
import com.chinaztt.mes.basic.entity.Crew;
import com.chinaztt.mes.basic.entity.JoinCrewStaff;
-import com.chinaztt.mes.basic.entity.Part;
import com.chinaztt.mes.basic.entity.Staff;
+import com.chinaztt.mes.basic.excel.CrewData;
import com.chinaztt.mes.basic.mapper.CrewMapper;
import com.chinaztt.mes.basic.mapper.JoinCrewStaffMapper;
import com.chinaztt.mes.basic.mapper.StaffMapper;
@@ -19,8 +20,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* 浜哄憳鐝粍缁存姢琛�
@@ -82,6 +83,44 @@
return staffMapper.selectStaffById(crewDTO.getId());
}
+ //瀵煎叆excel鏁版嵁
+ @Override
+ public void importWorkstationExcel(List<CrewData> list) {
+ if (CollectionUtil.isEmpty(list)) {
+ return;
+ }
+ List<Staff> staff = staffMapper.selectList(null);
+ Crew crew = new Crew();
+ for (CrewData data : list) {
+ QueryWrapper<Crew>QueryWrapper = new QueryWrapper<>();
+ QueryWrapper.lambda().eq(Crew::getCrewName,data.getCrewName());
+ Crew crew1 = baseMapper.selectOne(QueryWrapper);
+ if(!Objects.isNull(crew1)){
+ log.error("鐝粍鍚嶉噸澶�====銆�"+crew1.getCrewName());
+ continue;
+ }
+ //鏂板鐝粍琛�
+ if (ObjectUtils.isNotEmpty(data.getCrewName())) {
+ crew.setCrewName(data.getCrewName());
+ crew.setWorkShop(data.getWorkShop());
+ baseMapper.insert(crew);
+ }
+ JoinCrewStaff joinCrewStaff = new JoinCrewStaff();
+ joinCrewStaff.setCrewId(crew.getId());
+ for (int i = 0; i < staff.size(); i++) {
+ if (staff.get(i).getStaffNo().equals(data.getStaffNo())) {
+ joinCrewStaff.setStaffId(staff.get(i).getId());
+ }
+ }
+ if (joinCrewStaff.getStaffId() == null) {
+ log.error("浜哄憳:" + data.getStaffNo() + "涓嶅瓨鍦�");
+ continue;
+ }
+ //鏂板浜哄憳鐝粍缁存姢琛�
+ joinCrewStaffMapper.insert(joinCrewStaff);
+ }
+ }
+
public void saveJoin(CrewDTO crewDTO) {
if (CollectionUtil.isNotEmpty(crewDTO.getStaffList())) {
List<Staff> staffList = joinCrewStaffMapper.selectStaffByCrewId(crewDTO.getId());
--
Gitblit v1.9.3