From cfce5a0402f09b7f7891f045a77b8a9ceea69e1f Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 04 三月 2021 23:29:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
index a356ac4..8715199 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
@@ -7,20 +7,25 @@
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.*;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpLaborTroubleMapper;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpLaborTroubleService;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
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;
@@ -46,48 +51,51 @@
private final RedisService redisService;
private final EmpLaborTroubleMapper empLabortroubleMapper;
+ 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<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble) {
- LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpLaborTrouble::getDelFlag, empLabortrouble.getDelFlag());
+ QueryWrapper<EmpLaborTrouble> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empLabortrouble.getDelFlag());
if (StringUtils.isNotBlank(empLabortrouble.getEmpNumb())) {
- queryWrapper.like(EmpLaborTrouble::getEmpNumb, empLabortrouble.getEmpNumb());
+ queryWrapper.like("a.EmpNumb", empLabortrouble.getEmpNumb());
}
if (StringUtils.isNotBlank(empLabortrouble.getEmpName())) {
- queryWrapper.like(EmpLaborTrouble::getEmpName, empLabortrouble.getEmpName());
+ queryWrapper.like("a.EmpName", empLabortrouble.getEmpName());
}
if (StringUtils.isNotBlank(empLabortrouble.getCertificateNumb())) {
- queryWrapper.like(EmpLaborTrouble::getCertificateNumb, empLabortrouble.getCertificateNumb());
+ queryWrapper.like("a.CertificateNumb", empLabortrouble.getCertificateNumb());
}
if (StringUtils.isNotBlank(empLabortrouble.getDeptName())) {
- queryWrapper.like(EmpLaborTrouble::getDeptName, empLabortrouble.getDeptName());
+ queryWrapper.like("a.DeptName", empLabortrouble.getDeptName());
}
if (StringUtils.isNotBlank(empLabortrouble.getArbitrationDateStr())) {
- queryWrapper.between(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDateStr().split(",")[0],
+ queryWrapper.between("a.ArbitrationDate", empLabortrouble.getArbitrationDateStr().split(",")[0],
empLabortrouble.getArbitrationDateStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empLabortrouble.getSettleDateStr())) {
- queryWrapper.between(EmpLaborTrouble::getSettleDate, empLabortrouble.getSettleDateStr().split(",")[0],
+ queryWrapper.between("a.SettleDate", empLabortrouble.getSettleDateStr().split(",")[0],
empLabortrouble.getSettleDateStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empLabortrouble.getArbitrationType())) {
- queryWrapper.eq(EmpLaborTrouble::getArbitrationType, empLabortrouble.getArbitrationType());
+ queryWrapper.eq("a.ArbitrationType", empLabortrouble.getArbitrationType());
}
if (empLabortrouble.getArbitrationStatus() != null && empLabortrouble.getArbitrationStatus() != 0) {
- queryWrapper.eq(EmpLaborTrouble::getArbitrationStatus, empLabortrouble.getArbitrationStatus());
+ queryWrapper.eq("a.ArbitrationStatus", empLabortrouble.getArbitrationStatus());
}
if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
- queryWrapper.eq(EmpLaborTrouble::getEmpStatus, empLabortrouble.getEmpStatus());
+ queryWrapper.eq("a.EmpStatus", empLabortrouble.getEmpStatus());
}
if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
- queryWrapper.like(EmpLaborTrouble::getArbitrationReason, empLabortrouble.getArbitrationReason());
+ queryWrapper.like("a.ArbitrationReason", empLabortrouble.getArbitrationReason());
}
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
- IPage<EmpLaborTrouble> iPage = this.page(page, queryWrapper);
+ IPage<EmpLaborTrouble> iPage = empLabortroubleMapper.selectPageVo(page, queryWrapper);
iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
return iPage;
}
@@ -171,14 +179,27 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpLaborTrouble(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
EmpLaborTrouble empLabortrouble = new EmpLaborTrouble();
empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empLabortrouble.setEmpNumb(list.get(0).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
- .getDeptId();
+ 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()));
+ continue;
+ }
+ Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
+ if (null == empId){
+ returnList.add(StrUtil.format("导入员工劳资案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+ empLabortrouble.setDelFlag(2);
+ empLabortrouble.setEmpId(empId);
empLabortrouble.setDeptName(list.get(1).toString());
- empLabortrouble.setDeptId(deptId);
+ empLabortrouble.setDeptId(dept.getDeptId());
empLabortrouble.setJobName(list.get(2).toString());
empLabortrouble.setEmpName(list.get(3).toString());
empLabortrouble.setCertificateNumb(list.get(4).toString());
--
Gitblit v1.8.0