fix(bug修复): 到期合同的统计条件修改为只针对在职员工统计

luoyb

2021-11-05 6d240fbbf6a47b4125320f26c4f5c537e1493fb6

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java

@@ -1,21 +1,34 @@
package cc.mrbird.febs.server.hr.service.impl;

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.exception.FebsException;
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.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
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.*;

@@ -25,39 +38,70 @@
 * description:员工不良记录信息服务接口实现
 *
 * @author luoyibo
 * @date 2021-01-24 20:35:55
 * @date 2021-01-31 11:26:42
 * @since JDK1.8
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpBadRecordServiceImpl extends ServiceImpl<EmpBadRecordMapper, EmpBadRecord> implements IEmpBadRecordService {
class EmpBadRecordServiceImpl extends ServiceImpl<EmpBadRecordMapper, EmpBadRecord> implements IEmpBadRecordService {

   private final RedisService redisService;
    private final EmpBadRecordMapper empBadrecordMapper;
    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<EmpBadRecord> findEmpBadRecords(QueryRequest request, EmpBadRecord empBadrecord) {
        LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpBadRecord::getDelFlag, 0);

    public IPage<EmpBadRecord> findEmpBadrecords(QueryRequest request, EmpBadRecord empBadrecord) {
        QueryWrapper<EmpBadRecord> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.delFlag", empBadrecord.getDelFlag());
         if (StringUtils.isNotBlank(empBadrecord.getEmpNumb())) {
         queryWrapper.like("a.EmpNumb", empBadrecord.getEmpNumb());
      }
      if (StringUtils.isNotBlank(empBadrecord.getEmpName())) {
         queryWrapper.like("a.EmpName", empBadrecord.getEmpName());
      }
      if (StringUtils.isNotBlank(empBadrecord.getCertificateNumb())) {
         queryWrapper.like("a.CertificateNumb", empBadrecord.getCertificateNumb());
      }
      if (StringUtils.isNotBlank(empBadrecord.getDeptName())) {
         queryWrapper.like("b.allDeptName", empBadrecord.getDeptName());
      }
      if (StringUtils.isNotBlank(empBadrecord.getBadDateStr())) {
         queryWrapper.between("a.badDate", empBadrecord.getBadDateStr().split(",")[0],empBadrecord.getBadDateStr().split(",")[1]);
      }
      if (StringUtils.isNotBlank(empBadrecord.getBadContent())) {
         queryWrapper.like("a.badContent", empBadrecord.getBadContent());
      }
        if (StringUtils.isNotBlank(empBadrecord.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empBadrecord.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
        SortUtil.handlePageSort(request, page, "badDate", FebsConstant.ORDER_ASC, true);
        return empBadrecordMapper.selectPageVo(page, queryWrapper);
    }

    @Override
    public List<EmpBadRecord> findEmpBadRecords(EmpBadRecord empBadrecord) {
    public List<EmpBadRecord> findEmpBadrecords(EmpBadRecord empBadrecord) {
        LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpBadRecord::getDelFlag, 0);

        queryWrapper.eq(EmpBadRecord::getDelFlag, empBadrecord.getDelFlag());
        return this.baseMapper.selectList(queryWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpBadRecord(EmpBadRecord empBadrecord) {
    public void createEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException {
        LambdaQueryWrapper<EmpBadRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpBadRecord::getEmpId, empBadrecord.getEmpId());
        lambdaQueryWrapper.eq(EmpBadRecord::getBadDate, empBadrecord.getBadDate());
        lambdaQueryWrapper.ne(EmpBadRecord::getDelFlag,1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }
        empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empBadrecord.setCreator(operatorId);
        empBadrecord.setModifier(operatorId);
@@ -66,35 +110,107 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpBadRecord(EmpBadRecord empBadrecord) {
    public void updateEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException {
        LambdaQueryWrapper<EmpBadRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpBadRecord::getEmpId, empBadrecord.getEmpId());
        lambdaQueryWrapper.eq(EmpBadRecord::getBadDate, empBadrecord.getBadDate());
        lambdaQueryWrapper.ne(EmpBadRecord::getDelFlag,1);
        lambdaQueryWrapper.ne(EmpBadRecord::getBadId,empBadrecord.getBadId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }
        EmpBadRecord dbData = this.getById(empBadrecord.getBadId());
        empBadrecord.setCreateTime(dbData.getCreateTime());
        empBadrecord.setCreator(dbData.getCreator());
        empBadrecord.setDelFlag(dbData.getDelFlag());
        empBadrecord.setModifyTime(new Date());
        empBadrecord.setModifier(operatorId);

        this.saveOrUpdate(empBadrecord);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpBadRecord(EmpBadRecord empBadrecord) {
        UpdateWrapper<EmpBadRecord> updateWrapper = new UpdateWrapper<>();
        updateWrapper.set("delFlag", 1);
        updateWrapper.set("modifyTime", new Date());
        updateWrapper.set("modifier", operatorId);
        updateWrapper.set("version", empBadrecord.getVersion() + 1);
    public void deleteEmpBadrecord(EmpBadRecord empBadrecord) {
        LambdaQueryWrapper<EmpBadRecord> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
        this.remove(wrapper);
    }

        updateWrapper.eq("badId", empBadrecord.getBadId());
        this.update(updateWrapper);
    /**
     * 根据Id批量逻辑删除记录
     * <p>
     * date 2021-01-28 10:48
     *
     * @param ids 待删除Id
     * @return void
     * @author: luoyibo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void logicDelEmpBadrecord(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empBadrecordMapper.logicDeleteByIds(list, operatorId);
    }

    @Override
    public void logicDelEmpBadRecord(String ids) {
        List<String> list = new ArrayList<>();
    public boolean momentToNormal(String ids) {
        String[] str = ids.split(",");
        list.addAll(Arrays.asList(str));
        empBadrecordMapper.logicDeleteByIds(list, operatorId);
        List<String> list = new ArrayList<>(Arrays.asList(str));
        return empBadrecordMapper.momentToNormal(list, operatorId) > 0;
    }

    @Override
   @Transactional(rollbackFor = Exception.class)
    public void importEmpBadRecord(List<List<Object>> listObject,List<String>  returnList) {
       for (List<Object> list : listObject) {
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
            }
          EmpBadRecord empBadrecord=new EmpBadRecord();
          empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
          empBadrecord.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()));
                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;
            }
            empBadrecord.setDelFlag(0);
            empBadrecord.setEmpId(empId);
         empBadrecord.setDeptName(list.get(1).toString());
         empBadrecord.setDeptId(dept.getDeptId());
         empBadrecord.setJobName(list.get(2).toString());
         empBadrecord.setEmpName(list.get(3).toString());
         empBadrecord.setCertificateNumb(list.get(4).toString());
         try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    empBadrecord.setBadDate(DateUtil.parse(list.get(5).toString()));
                }
            }catch (Exception e){
                returnList.add(StrUtil.format("导入员工不良记录信息异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }

         empBadrecord.setBadContent(list.get(6).toString());
         empBadrecord.setReporter(list.get(7).toString());
         empBadrecord.setRemark(list.get(8).toString());
         this.save(empBadrecord);
       }
   }

    @Override
    public void logicDelByUserIds(String userIds) {
        String[] str = userIds.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empBadrecordMapper.logicDelByUserIds(list, operatorId);
    }
}