From 18c13ba8900911f41a60df49125b4570b3852e0b Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 20 六月 2021 18:16:16 +0800
Subject: [PATCH] fix(bug修复): 证件查询从或改为与
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 266 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 219 insertions(+), 47 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 359775f..bca8106 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,70 +1,242 @@
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.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
+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.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.common.core.utils.SortUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
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.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.annotation.Propagation;
-import lombok.RequiredArgsConstructor;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
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 lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
+import java.util.*;
/**
-*
-* name:EmpContractinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工合同信息服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:42
-* @since JDK1.8
-*/
+ * name:EmpContractinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工合同信息服务接口实现
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:28:23
+ * @since JDK1.8
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpContractInfoServiceImpl extends ServiceImpl
-<EmpContractInfoMapper, EmpContractInfo> implements IEmpContractInfoService {
+class EmpContractInfoServiceImpl extends ServiceImpl<EmpContractInfoMapper, EmpContractInfo> implements IEmpContractInfoService {
-private final EmpContractInfoMapper empContractinfoMapper;
+ 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<>();
-// TODO 设置查询条件
-Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
+ 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("b.allDeptName", 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("b.EmpStatus", empContractinfo.getEmpStatus().split(","));
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+ Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ SortUtil.handlePageSort(request, page, "beginDate", FebsConstant.ORDER_ASC, true);
+ 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
-public List<EmpContractInfo> findEmpContractinfos(EmpContractInfo empContractinfo) {
-LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpContractInfo> findEmpContractinfos(EmpContractInfo empContractinfo) {
+ LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpContractInfo::getDelFlag, empContractinfo.getDelFlag());
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpContractinfo(EmpContractInfo empContractinfo) {
-this.save(empContractinfo);
-}
+ @Override
+ @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);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpContractinfo(EmpContractInfo empContractinfo) {
-this.saveOrUpdate(empContractinfo);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpContractinfo(EmpContractInfo empContractinfo) {
+ EmpContractInfo dbData = this.getById(empContractinfo.getContractId());
+ empContractinfo.setCreateTime(dbData.getCreateTime());
+ empContractinfo.setCreator(dbData.getCreator());
+ empContractinfo.setDelFlag(dbData.getDelFlag());
+ empContractinfo.setModifyTime(new Date());
+ empContractinfo.setModifier(operatorId);
+ this.saveOrUpdate(empContractinfo);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpContractinfo(EmpContractInfo empContractinfo) {
-LambdaQueryWrapper<EmpContractInfo> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpContractinfo(EmpContractInfo empContractinfo) {
+ LambdaQueryWrapper<EmpContractInfo> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
-this.remove(wapper);
-}
+ this.remove(wrapper);
+ }
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpContractinfo(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empContractinfoMapper.logicDeleteByIds(list, operatorId);
+ }
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empContractinfoMapper.momentToNormal(list, operatorId) > 0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpContractInfo(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems ) {
+ for (List<Object> list : listObject) {
+ if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
+ 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);
+ if(null == depts){
+ depts =remoteDeptService.setDeptRedis();
+ }
+ 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()));
+ 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(0);
+ 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());
+ try {
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ contractInfo.setSigningDate(DateUtil.parse(list.get(5).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(6).toString())) {
+ contractInfo.setBeginDate(DateUtil.parse(list.get(6).toString()));
+ }
+
+ if (StringUtils.isNotBlank(list.get(7).toString())) {
+ contractInfo.setEndDate(DateUtil.parse(list.get(7).toString()));
+ }
+ }catch (Exception e){
+ returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+
+ if (StringUtils.isNotBlank(list.get(8).toString())) {
+ contractInfo.setContractPeriod(Float.valueOf(list.get(8).toString()));
+ }
+ //合同
+ DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"contractStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
+ if (null!=dicItem){
+ contractInfo.setContractStatus(dicItem.getDicItemCode());
+ }
+
+ 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