Merge remote-tracking branch 'origin/master'

Alan

2021-02-19 7e172d1de04d55caafd86489fa81c06c142adab2

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

@@ -2,8 +2,11 @@

import cc.mrbird.febs.common.core.constant.ModuleCode;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -40,7 +43,23 @@
    @Override
    public IPage<EmpBadRecord> findEmpBadrecords(QueryRequest request, EmpBadRecord empBadrecord) {
        LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpBadRecord::getDelFlag, 0);
        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]);
      }
        Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }
@@ -48,7 +67,7 @@
    @Override
    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);
    }

@@ -97,4 +116,11 @@
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empBadrecordMapper.logicDeleteByIds(list, operatorId);
    }

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