From 19b2927073b5a2b14ca07939a6bfc0a0a34fe98c Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 17 三月 2021 04:03:38 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
index 77edc80..932c426 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
@@ -1,12 +1,15 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpResignMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
@@ -19,10 +22,12 @@
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;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.core.utils.FebsUtil;
@@ -48,34 +53,40 @@
private final RedisService redisService;
private final EmpResignMapper empResignMapper;
private final IEmpBaseInfoService empBaseInfoService;
+ private final IRemoteDeptService remoteDeptService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@Override
public IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign) {
- LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpResign::getDelFlag, empResign.getDelFlag());
+ QueryWrapper<EmpResign> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empResign.getDelFlag());
Page<EmpResign> page = new Page<>(request.getPageNum(), request.getPageSize());
if (StringUtils.isNotBlank(empResign.getEmpNumb())) {
- queryWrapper.like(EmpResign::getEmpNumb, empResign.getEmpNumb());
+ queryWrapper.like("a.EmpNumb", empResign.getEmpNumb());
}
if (StringUtils.isNotBlank(empResign.getEmpName())) {
- queryWrapper.like(EmpResign::getEmpName, empResign.getEmpName());
+ queryWrapper.like("a.EmpName", empResign.getEmpName());
}
if (StringUtils.isNotBlank(empResign.getCertificateNumb())) {
- queryWrapper.like(EmpResign::getCertificateNumb, empResign.getCertificateNumb());
+ queryWrapper.like("a.CertificateNumb", empResign.getCertificateNumb());
}
if (StringUtils.isNotBlank(empResign.getDeptName())) {
- queryWrapper.like(EmpResign::getDeptName, empResign.getDeptName());
+ queryWrapper.like("a.DeptName", empResign.getDeptName());
}
if (StringUtils.isNotBlank(empResign.getApplayDateStr())) {
- queryWrapper.between(EmpResign::getApplayDate, empResign.getApplayDateStr().split(",")[0], empResign.getApplayDateStr().split(",")[1]);
+ queryWrapper.between("a.ApplayDate", empResign.getApplayDateStr().split(",")[0], empResign.getApplayDateStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empResign.getReason())) {
- queryWrapper.like(EmpResign::getReason, empResign.getReason());
+ queryWrapper.like("a.Reason", empResign.getReason());
}
- return this.page(page, queryWrapper);
+ if (StringUtils.isNotBlank(empResign.getEmpStatus())) {
+ queryWrapper.in("b.EmpStatus", empResign.getEmpStatus().split(","));
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ return empResignMapper.selectPageVo(page, queryWrapper);
}
@Override
@@ -157,13 +168,16 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpResign(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
- if (list.size()==0){
+ if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
continue;
}
EmpResign resign = new EmpResign();
resign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
resign.setEmpNumb(list.get(0).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ if(null == depts){
+ depts =remoteDeptService.setDeptRedis();
+ }
Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
if (null == dept) {
returnList.add(StrUtil.format("导入员工辞职申请异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
--
Gitblit v1.8.0