From 6343cac51e460280c721c9db0238b62389146590 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期四, 04 三月 2021 00:56:46 +0800
Subject: [PATCH] 权限与导出
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index 3b85814..7bf0598 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpWorkExperienceMapper;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
import cn.hutool.core.date.DateUtil;
@@ -15,6 +16,7 @@
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -37,31 +39,34 @@
class EmpWorkExperienceServiceImpl extends ServiceImpl<EmpWorkExperienceMapper, EmpWorkExperience> implements IEmpWorkExperienceService {
private final EmpWorkExperienceMapper empWorkexperienceMapper;
+ private final IRemoteDeptService remoteDeptService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@Override
public IPage<EmpWorkExperience> findEmpWorkExperiences(QueryRequest request, EmpWorkExperience empWorkexperience) {
- LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
+ QueryWrapper<EmpWorkExperience> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.delFlag",empWorkexperience.getDelFlag());
if (StringUtils.isNotBlank(empWorkexperience.getEmpNumb())) {
- queryWrapper.like(EmpWorkExperience::getEmpNumb, empWorkexperience.getEmpNumb());
+ queryWrapper.like("a.empNumb", empWorkexperience.getEmpNumb());
}
if (StringUtils.isNotBlank(empWorkexperience.getEmpName())) {
- queryWrapper.like(EmpWorkExperience::getEmpName, empWorkexperience.getEmpName());
+ queryWrapper.like("a.EmpName", empWorkexperience.getEmpName());
}
if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
- queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
+ queryWrapper.like("a.certificateNumb", empWorkexperience.getCertificateNumb());
}
if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
- queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
+ queryWrapper.like("a.certificateNumb", empWorkexperience.getCertificateNumb());
}
if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
- queryWrapper.eq(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent());
+ queryWrapper.like("a.jobContent", empWorkexperience.getJobContent());
}
Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+
+ queryWrapper.in("c.deptId", remoteDeptService.userRightDepts());
+ return this.empWorkexperienceMapper.selectPageVo(page, queryWrapper);
}
@Override
@@ -129,8 +134,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpWorkExperience(List<List<Object>> listObject) {
+ public void importEmpWorkExperience(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
EmpWorkExperience workExperience = new EmpWorkExperience();
workExperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
workExperience.setEmpNumb(list.get(0).toString());
@@ -142,10 +150,10 @@
workExperience.setBeginDate(DateUtil.parseDate(list.get(5).toString()));
}
if (StringUtils.isNotBlank(list.get(6).toString())) {
- workExperience.setBeginDate(DateUtil.parseDate(list.get(6).toString()));
+ workExperience.setEndDate(DateUtil.parseDate(list.get(6).toString()));
}
workExperience.setJobContent(list.get(7).toString());
this.save(workExperience);
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0