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 | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 b797923..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
@@ -8,22 +8,20 @@
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.*;
+import com.chinaztt.mes.basic.entity.Crew;
+import com.chinaztt.mes.basic.entity.JoinCrewStaff;
+import com.chinaztt.mes.basic.entity.Staff;
import com.chinaztt.mes.basic.excel.CrewData;
-import com.chinaztt.mes.basic.excel.PostData;
import com.chinaztt.mes.basic.mapper.CrewMapper;
import com.chinaztt.mes.basic.mapper.JoinCrewStaffMapper;
import com.chinaztt.mes.basic.mapper.StaffMapper;
import com.chinaztt.mes.basic.service.CrewService;
import lombok.AllArgsConstructor;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.Objects;
/**
* 浜哄憳鐝粍缁存姢琛�
@@ -94,6 +92,13 @@
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());
--
Gitblit v1.9.3