feat(分支合并): 在职员工

luoyb

2021-02-19 1b170de4c1d4bd3f43f7a401fd68e73effd3f464

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

@@ -2,8 +2,12 @@

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.entity.EmpOccupational;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.mapper.EmpLaborTroubleMapper;
import cc.mrbird.febs.server.hr.service.IEmpLaborTroubleService;

import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -41,6 +45,35 @@
    public IPage<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble) {
        LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpLaborTrouble::getDelFlag, empLabortrouble.getDelFlag());
        if (StringUtils.isNotBlank(empLabortrouble.getEmpNumb())) {
         queryWrapper.like(EmpLaborTrouble::getEmpNumb, empLabortrouble.getEmpNumb());
      }
      if (StringUtils.isNotBlank(empLabortrouble.getEmpName())) {
         queryWrapper.like(EmpLaborTrouble::getEmpName, empLabortrouble.getEmpName());
      }
      if (StringUtils.isNotBlank(empLabortrouble.getCertificateNumb())) {
         queryWrapper.like(EmpLaborTrouble::getCertificateNumb, empLabortrouble.getCertificateNumb());
      }
      if (StringUtils.isNotBlank(empLabortrouble.getDeptName())) {
         queryWrapper.like(EmpLaborTrouble::getDeptName, empLabortrouble.getDeptName());
      }
      if (StringUtils.isNotBlank(empLabortrouble.getArbitrationDateStr())) {
         queryWrapper.between(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDateStr().split(",")[0],
               empLabortrouble.getArbitrationDateStr().split(",")[1]);
      }
      if (StringUtils.isNotBlank(empLabortrouble.getSettleDateStr())) {
         queryWrapper.between(EmpLaborTrouble::getSettleDate, empLabortrouble.getSettleDateStr().split(",")[0],
               empLabortrouble.getSettleDateStr().split(",")[1]);
      }
      if (StringUtils.isNotBlank(empLabortrouble.getArbitrationType())) {
         queryWrapper.eq(EmpLaborTrouble::getArbitrationType, empLabortrouble.getArbitrationType());
      }
      if (empLabortrouble.getArbitrationStatus() != null && empLabortrouble.getArbitrationStatus() != 0) {
         queryWrapper.eq(EmpLaborTrouble::getArbitrationStatus, empLabortrouble.getArbitrationStatus());
      }
      if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
         queryWrapper.eq(EmpLaborTrouble::getEmpStatus, empLabortrouble.getEmpStatus());
      }
        Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }