From 931db51a7faf8bd8efa68e80db39cad057dcbbdf Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 08 十一月 2023 15:06:31 +0800
Subject: [PATCH] Changes11
---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java
index a2ecea3..7779669 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java
@@ -25,12 +25,13 @@
import com.chinaztt.mes.basic.excel.StaffData;
import com.chinaztt.mes.basic.mapper.*;
import com.chinaztt.mes.basic.service.StaffService;
-import com.chinaztt.ztt.common.data.datascope.DataScope;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Objects;
/**
* 鍛樺伐
@@ -40,6 +41,7 @@
*/
@Service
@AllArgsConstructor
+@Slf4j
public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements StaffService {
private DivisionMapper divisionMapper;
@@ -87,6 +89,13 @@
List<Company> companies = companyMapper.selectList(null);
List<Factory> factories = factoryMapper.selectList(null);
for (StaffData staffData : list) {
+ QueryWrapper<Staff> QueryWrapper = new QueryWrapper<>();
+ QueryWrapper.lambda().eq(Staff::getStaffNo,staffData.getStaffNo());
+ Staff staff1 = baseMapper.selectOne(QueryWrapper);
+ if(!Objects.isNull(staff1)){
+ log.error("鍛樺伐缂栧彿閲嶅======銆�"+staffData.getStaffNo());
+ continue;
+ }
Staff staff = new Staff();
BeanUtils.copyProperties(staffData, staff);
for (int i = 0; i < divisions.size(); i++) {
--
Gitblit v1.9.3