From 42f3ffb553c071f15d9fd4495c7bf8af795bf292 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 27 四月 2021 20:25:59 +0800
Subject: [PATCH] fix(bug修复): 员工附件增加相关证件查询
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 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 1751d97..874280e 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
@@ -2,11 +2,14 @@
import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.system.DicItem;
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.*;
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;
@@ -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;
@@ -49,48 +54,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.in("a.EmpStatus", empLabortrouble.getEmpStatus().split(","));
}
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);
+ SortUtil.handlePageSort(request, page, "arbitrationDate", FebsConstant.ORDER_ASC, true);
+ IPage<EmpLaborTrouble> iPage = empLabortroubleMapper.selectPageVo(page, queryWrapper);
iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
return iPage;
}
@@ -172,15 +180,18 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpLaborTrouble(List<List<Object>> listObject,List<String> returnList) {
+ public void importEmpLaborTrouble(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems ) {
for (List<Object> list : listObject) {
- if (list.size()==0){
+ if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
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);
+ 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()));
@@ -191,7 +202,7 @@
returnList.add(StrUtil.format("导入员工劳资案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- empLabortrouble.setDelFlag(2);
+ empLabortrouble.setDelFlag(0);
empLabortrouble.setEmpId(empBaseInfo.getEmpId());
empLabortrouble.setDeptName(list.get(1).toString());
empLabortrouble.setDeptId(dept.getDeptId());
@@ -201,7 +212,14 @@
if (StringUtils.isNotBlank(list.get(5).toString())) {
empLabortrouble.setArbitrationDate(DateUtil.parseDateTime(list.get(5).toString()));
}
- empLabortrouble.setArbitrationType(list.get(6).toString());
+
+ //仲裁类型
+ DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"zctype")&&StrUtil.equals(j.getDicItemName(),list.get(6).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empLabortrouble.setArbitrationType(dicItem.getDicItemCode());
+ }
+
+
empLabortrouble.setArbitrationReason(list.get(7).toString());
empLabortrouble.setReporter(list.get(8).toString());
empLabortrouble.setRemark(list.get(9).toString());
@@ -224,10 +242,10 @@
list.forEach(p -> {
//仲裁类型
p.setArbitrationTypeName(dicItems.stream()
- .filter(k -> DicCode.ARBITRATIONTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getArbitrationType()))
+ .filter(k -> DicCode.ZCTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getArbitrationType()))
.findFirst()
.map(DicItem::getDicItemName)
- .orElse("劳资纠纷"));
+ .orElse(""));
});
return list;
--
Gitblit v1.8.0