From f4151abee349597ed58a405a8a5e48a5d1a1f7a6 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 02 六月 2024 19:06:39 +0800
Subject: [PATCH] fix: 问题修复 1.员工档案中修改合同时性别不能自动带入问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java | 88 ++++++++++++++++++++++++++++++++------------
1 files changed, 64 insertions(+), 24 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 26baa24..7eaf2e0 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
@@ -1,11 +1,16 @@
package cc.mrbird.febs.server.hr.service.impl;
+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.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 +24,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 +54,54 @@
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("b.allDeptName", 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("b.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);
+ SortUtil.handlePageSort(request, page, "applayDate", FebsConstant.ORDER_ASC, true);
+ IPage<EmpInsurance> iPage = empInsuranceMapper.selectPageVo(page, queryWrapper);
+ List<EmpInsurance> list = iPage.getRecords();
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p -> {
+ p.setInsuranceGaersName(dicItems.stream()
+ .filter(k -> DicCode.INSURANCE_GAERS.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getInsuranceGaers()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("未知"));
+ });
+ iPage.setRecords(list);
+ return iPage;
}
@Override
@@ -161,15 +181,18 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpInsurance(List<List<Object>> listObject,List<String> returnList) {
+ public void importEmpInsurance(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;
}
EmpInsurance empInsurance = new EmpInsurance();
empInsurance.setInsuranceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empInsurance.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()));
@@ -180,27 +203,44 @@
returnList.add(StrUtil.format("导入社保申请服务异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- empInsurance.setDelFlag(2);
+ empInsurance.setDelFlag(0);
empInsurance.setEmpId(empBaseInfo.getEmpId());
empInsurance.setDeptName(list.get(1).toString());
empInsurance.setDeptId(dept.getDeptId());
empInsurance.setJobName(list.get(2).toString());
empInsurance.setEmpName(list.get(3).toString());
empInsurance.setCertificateNumb(list.get(4).toString());
- if (StringUtils.isNotBlank(list.get(5).toString())) {
- empInsurance.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
+ try {
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empInsurance.setApplayDate(DateUtil.parse(list.get(5).toString()));
+ }
+ }catch (Exception e){
+ returnList.add(StrUtil.format("导入社保申请服务异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
}
+
empInsurance.setProposer(list.get(6).toString());
- empInsurance.setInsuranceGaers(list.get(7).toString());
- if (StringUtils.isNotBlank(list.get(8).toString())) {
- empInsurance.setReportStatus("未报告".equals(list.get(8).toString()) ? 0 : 1);
+ //社保档位
+ DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"INSURANCETYPE")&&StrUtil.equals(j.getDicItemName(),list.get(7).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empInsurance.setInsuranceGaers(dicItem.getDicItemCode());
}
- if (StringUtils.isNotBlank(list.get(8).toString())) {
- empInsurance.setApplayStatus("未申请".equals(list.get(8).toString()) ? 0 : 1);
+
+
+ dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"reportStatus")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empInsurance.setReportStatus(Integer.valueOf(dicItem.getDicItemCode()));
}
- empInsurance.setAuditor(list.get(9).toString());
- empInsurance.setRemark(list.get(10).toString());
+
+ dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"applayStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ empInsurance.setApplayStatus(Integer.valueOf(dicItem.getDicItemCode()));
+ }
+
+ empInsurance.setAuditor(list.get(10).toString());
+ empInsurance.setRemark(list.get(11).toString());
empInsurance.setEmpStatus(empBaseInfo.getEmpStatus());
+ empInsurance.setCreator(FebsUtil.getUserId());
this.save(empInsurance);
}
}
--
Gitblit v1.8.0