From c3a6b64f474a112b55b0693126721f295d1d1279 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期二, 09 三月 2021 21:45:01 +0800
Subject: [PATCH] xx
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 147 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 134 insertions(+), 13 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index adc53a7..4307202 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -1,22 +1,40 @@
package cc.mrbird.febs.server.hr.service.impl;
-import cc.mrbird.febs.common.core.constant.ModuleCode;
-import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
-import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
-import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+import cc.mrbird.febs.common.core.constant.DicCode;
+import cc.mrbird.febs.common.core.entity.system.Dept;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
+import cc.mrbird.febs.common.core.utils.CastUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
+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 org.springframework.transaction.annotation.Transactional;
+
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.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
-
-import java.util.*;
+import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
+import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
+import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
+import cn.hutool.core.date.DateUtil;
+import lombok.RequiredArgsConstructor;
/**
* name:EmpContractinfo
@@ -32,17 +50,60 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpContractInfoServiceImpl extends ServiceImpl<EmpContractInfoMapper, EmpContractInfo> implements IEmpContractInfoService {
+ private final RedisService redisService;
private final EmpContractInfoMapper empContractinfoMapper;
+ private final IRemoteDeptService remoteDeptService;
+ private final IEmpBaseInfoService empBaseInfoService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@Override
public IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
- LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpContractInfo::getDelFlag, empContractinfo.getDelFlag());
+ QueryWrapper<EmpContractInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empContractinfo.getDelFlag());
+ if (StringUtils.isNotBlank(empContractinfo.getEmpNumb())) {
+ queryWrapper.like("a.EmpNumb", empContractinfo.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getEmpName())) {
+ queryWrapper.like("a.EmpName", empContractinfo.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getCertificateNumb())) {
+ queryWrapper.like("a.CertificateNumb", empContractinfo.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
+ queryWrapper.like("a.DeptName", empContractinfo.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getSigningDateStr())) {
+ queryWrapper.between("a.SigningDate", empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getEndDateStr())) {
+ queryWrapper.between("a.EndDate", empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
+ queryWrapper.in("a.deptName", empContractinfo.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getContractStatus())) {
+ queryWrapper.eq("a.ContractStatus", empContractinfo.getContractStatus());
+ }
+ if (StringUtils.isNotBlank(empContractinfo.getEmpStatus())) {
+ queryWrapper.in("a.EmpStatus", empContractinfo.getEmpStatus().split(","));
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ IPage<EmpContractInfo> iPage = empContractinfoMapper.selectPageVo(page, queryWrapper);
+ List<EmpContractInfo> list = iPage.getRecords();
+ //设置字典数据
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p -> {
+ p.setContractStatusName(dicItems.stream()
+ .filter(k -> DicCode.CONTRACTSTATUS.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getContractStatus()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("新签"));
+ });
+ iPage.setRecords(list);
+ return iPage;
}
@Override
@@ -56,6 +117,9 @@
@Transactional(rollbackFor = Exception.class)
public void createEmpContractinfo(EmpContractInfo empContractinfo) {
empContractinfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ if (empContractinfo.getBeginDate() == null) {
+ empContractinfo.setBeginDate(empContractinfo.getSigningDate());
+ }
empContractinfo.setCreator(operatorId);
empContractinfo.setModifier(operatorId);
this.save(empContractinfo);
@@ -102,6 +166,63 @@
public boolean momentToNormal(String ids) {
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
- return empContractinfoMapper.momentToNormal(list, operatorId)>0;
+ return empContractinfoMapper.momentToNormal(list, operatorId) > 0;
}
-}
\ No newline at end of file
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpContractInfo(List<List<Object>> listObject,List<String> returnList) {
+ for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
+ EmpContractInfo contractInfo = new EmpContractInfo();
+ contractInfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ contractInfo.setEmpNumb(list.get(0).toString());
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ 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;
+ }
+ contractInfo.setDelFlag(2);
+ contractInfo.setEmpId(empId);
+ contractInfo.setDeptName(list.get(1).toString());
+ contractInfo.setDeptId(dept.getDeptId());
+ contractInfo.setJobName(list.get(2).toString());
+ contractInfo.setEmpName(list.get(3).toString());
+ contractInfo.setCertificateNumb(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ contractInfo.setSigningDate(DateUtil.parseDate(list.get(5).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(6).toString())) {
+ contractInfo.setBeginDate(DateUtil.parseDate(list.get(6).toString()));
+ }
+
+ if (StringUtils.isNotBlank(list.get(7).toString())) {
+ contractInfo.setEndDate(DateUtil.parseDate(list.get(7).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(8).toString())) {
+ contractInfo.setContractPeriod(Integer.valueOf(list.get(8).toString()));
+ }
+ contractInfo.setContractStatus(list.get(9).toString());
+ contractInfo.setTransactor(list.get(10).toString());
+ contractInfo.setRemark(list.get(11).toString());
+
+ this.save(contractInfo);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void terminateContract(String empIds, String operatorId) {
+ String[] str = empIds.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empContractinfoMapper.terminateContract(list, operatorId);
+ }
+}
--
Gitblit v1.8.0