From 8e17ffd131c99250f648c73c6c839c5088717951 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 13 十一月 2023 19:54:47 +0800
Subject: [PATCH] Changes11
---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PostServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PostServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PostServiceImpl.java
index 74adc64..c39ae5c 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PostServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PostServiceImpl.java
@@ -1,13 +1,16 @@
package com.chinaztt.mes.basic.service.impl;
import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.chinaztt.mes.basic.entity.*;
+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.entity.Post;
import com.chinaztt.mes.basic.excel.PostData;
-import com.chinaztt.mes.basic.excel.StaffData;
import com.chinaztt.mes.basic.mapper.CompanyMapper;
import com.chinaztt.mes.basic.mapper.DivisionMapper;
import com.chinaztt.mes.basic.mapper.FactoryMapper;
@@ -20,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+import java.util.Objects;
/**
* 宀椾綅琛�
@@ -72,9 +76,17 @@
List<Factory> factories = factoryMapper.selectList(null);
List<Division> divisions = divisionMapper.selectList(null);
for (PostData data : list) {
+ QueryWrapper<Post>QueryWrapper = new QueryWrapper<>();
+ QueryWrapper.lambda().eq(Post::getPostNo,data.getPostNo());
+ Post post1 = baseMapper.selectOne(QueryWrapper);
+ if(!Objects.isNull(post1)){
+ log.error("宀椾綅缂栧彿閲嶅=====銆�"+data.getPostNo());
+ continue;
+ }
Post post = new Post();
BeanUtils.copyProperties(data, post);
- post.setPostName(data.getWorkShops()+"-"+data.getPostName());
+ //TODO: data.getDivisionName()+"-"+ 宀椾綅缁勫悎 閮ㄩ棬+宀椾綅
+ post.setPostName(data.getPostName());
for (int i = 0; i <companies.size() ; i++) {
if (companies.get(i).getCompanyName().equals(data.getCompanyName())){
post.setCompanyId(companies.get(i).getId());
--
Gitblit v1.9.3