From 1f5fe83df4d02e221fa57dd246a988b32ab02584 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 09 三月 2021 18:09:43 +0800
Subject: [PATCH] fix(bug修复): 导出Excel
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
index 6c1936f..5c6638d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.mapper.EmpInsuranceMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
@@ -19,10 +20,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;
@@ -47,41 +50,42 @@
private final RedisService redisService;
private final EmpInsuranceMapper empInsuranceMapper;
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<EmpInsurance> findEmpInsurances(QueryRequest request, EmpInsurance empInsurance) {
- LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpInsurance::getDelFlag, empInsurance.getDelFlag());
+ QueryWrapper<EmpInsurance> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empInsurance.getDelFlag());
if (StringUtils.isNotBlank(empInsurance.getEmpNumb())) {
- queryWrapper.like(EmpInsurance::getEmpNumb, empInsurance.getEmpNumb());
+ queryWrapper.like("a.EmpNumb", empInsurance.getEmpNumb());
}
if (StringUtils.isNotBlank(empInsurance.getEmpName())) {
- queryWrapper.like(EmpInsurance::getEmpName, empInsurance.getEmpName());
+ queryWrapper.like("a.EmpName", empInsurance.getEmpName());
}
if (StringUtils.isNotBlank(empInsurance.getCertificateNumb())) {
- queryWrapper.like(EmpInsurance::getCertificateNumb, empInsurance.getCertificateNumb());
+ queryWrapper.like("a.CertificateNumb", empInsurance.getCertificateNumb());
}
if (StringUtils.isNotBlank(empInsurance.getDeptName())) {
- queryWrapper.like(EmpInsurance::getDeptName, empInsurance.getDeptName());
+ queryWrapper.like("a.DeptName", empInsurance.getDeptName());
}
if (StringUtils.isNotBlank(empInsurance.getApplayDateStr())) {
- queryWrapper.between(EmpInsurance::getApplayDate, empInsurance.getApplayDateStr().split(",")[0],
+ queryWrapper.between("a.ApplayDate", empInsurance.getApplayDateStr().split(",")[0],
empInsurance.getApplayDateStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empInsurance.getInsuranceGaers())) {
- queryWrapper.eq(EmpInsurance::getInsuranceGaers, empInsurance.getInsuranceGaers());
+ queryWrapper.eq("a.InsuranceGaers", empInsurance.getInsuranceGaers());
}
if (empInsurance.getReportStatus() != null && empInsurance.getReportStatus() != 0) {
- queryWrapper.eq(EmpInsurance::getReportStatus, empInsurance.getReportStatus());
+ queryWrapper.eq("a.ReportStatus", empInsurance.getReportStatus());
}
if (StringUtils.isNotBlank(empInsurance.getEmpStatus())) {
- queryWrapper.eq(EmpInsurance::getEmpStatus, empInsurance.getEmpStatus());
+ queryWrapper.in("a.EmpStatus", empInsurance.getEmpStatus().split(","));
}
-
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ return empInsuranceMapper.selectPageVo(page, queryWrapper);
}
@Override
@@ -175,13 +179,13 @@
returnList.add(StrUtil.format("导入社保申请服务异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
continue;
}
- Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
- if (null == empId){
+ EmpBaseInfo empBaseInfo = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
+ if (null == empBaseInfo){
returnList.add(StrUtil.format("导入社保申请服务异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
empInsurance.setDelFlag(2);
- empInsurance.setEmpId(empId);
+ empInsurance.setEmpId(empBaseInfo.getEmpId());
empInsurance.setDeptName(list.get(1).toString());
empInsurance.setDeptId(dept.getDeptId());
empInsurance.setJobName(list.get(2).toString());
@@ -200,6 +204,7 @@
}
empInsurance.setAuditor(list.get(9).toString());
empInsurance.setRemark(list.get(10).toString());
+ empInsurance.setEmpStatus(empBaseInfo.getEmpStatus());
this.save(empInsurance);
}
}
--
Gitblit v1.8.0