Merge branch 'lybfix20210302'

luoyb

2021-03-02 f961867e0e1ca3251928b1134eb66549a6a89ee3

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

@@ -1,9 +1,16 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
import cn.hutool.core.date.DateUtil;

import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -13,8 +20,11 @@
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.system.Dept;
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.redis.service.RedisService;

import java.util.*;

@@ -32,6 +42,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpBadRecordServiceImpl extends ServiceImpl<EmpBadRecordMapper, EmpBadRecord> implements IEmpBadRecordService {

   private final RedisService redisService;
    private final EmpBadRecordMapper empBadrecordMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
@@ -41,6 +52,25 @@
    public IPage<EmpBadRecord> findEmpBadrecords(QueryRequest request, EmpBadRecord empBadrecord) {
        LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpBadRecord::getDelFlag, empBadrecord.getDelFlag());
        if (StringUtils.isNotBlank(empBadrecord.getEmpNumb())) {
         queryWrapper.like(EmpBadRecord::getEmpNumb, empBadrecord.getEmpNumb());
      }
      if (StringUtils.isNotBlank(empBadrecord.getEmpName())) {
         queryWrapper.like(EmpBadRecord::getEmpName, empBadrecord.getEmpName());
      }
      if (StringUtils.isNotBlank(empBadrecord.getCertificateNumb())) {
         queryWrapper.like(EmpBadRecord::getCertificateNumb, empBadrecord.getCertificateNumb());
      }
      if (StringUtils.isNotBlank(empBadrecord.getDeptName())) {
         queryWrapper.like(EmpBadRecord::getDeptName, empBadrecord.getDeptName());
      }
      if (StringUtils.isNotBlank(empBadrecord.getBadDateStr())) {
         queryWrapper.between(EmpBadRecord::getBadDate, empBadrecord.getBadDateStr().split(",")[0],
               empBadrecord.getBadDateStr().split(",")[1]);
      }
      if (StringUtils.isNotBlank(empBadrecord.getBadContent())) {
         queryWrapper.like(EmpBadRecord::getBadContent, empBadrecord.getBadContent());
      }
        Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }
@@ -54,7 +84,14 @@

    @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);
@@ -63,7 +100,15 @@

    @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());
@@ -104,4 +149,29 @@
        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) {
       for (List<Object> list : listObject) {
          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);
         Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
               .getDeptId();
         empBadrecord.setDeptName(list.get(1).toString());
         empBadrecord.setDeptId(deptId);
         empBadrecord.setJobName(list.get(2).toString());
         empBadrecord.setEmpName(list.get(3).toString());
         empBadrecord.setCertificateNumb(list.get(4).toString());
         if (StringUtils.isNotBlank(list.get(5).toString())) {
            empBadrecord.setBadDate(DateUtil.parseDateTime(list.get(5).toString()));
         }
         empBadrecord.setBadContent(list.get(6).toString());
         empBadrecord.setReporter(list.get(7).toString());
         empBadrecord.setRemark(list.get(8).toString());
         this.save(empBadrecord);
       }
   }
}