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/EmpRemarkInfoServiceImpl.java

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

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.mapper.EmpRemarkInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;

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<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo) {
        LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpRemarkInfo::getDelFlag, 0);
        queryWrapper.eq(EmpRemarkInfo::getDelFlag, empRemarkinfo.getDelFlag());
        if (StringUtils.isNotBlank(empRemarkinfo.getEmpNumb())) {
         queryWrapper.like(EmpRemarkInfo::getEmpNumb, empRemarkinfo.getEmpNumb());
      }
      if (StringUtils.isNotBlank(empRemarkinfo.getEmpName())) {
         queryWrapper.like(EmpRemarkInfo::getEmpName, empRemarkinfo.getEmpName());
      }
      if (StringUtils.isNotBlank(empRemarkinfo.getCertificateNumb())) {
         queryWrapper.like(EmpRemarkInfo::getCertificateNumb, empRemarkinfo.getCertificateNumb());
      }
      if (StringUtils.isNotBlank(empRemarkinfo.getDeptName())) {
         queryWrapper.like(EmpRemarkInfo::getDeptName, empRemarkinfo.getDeptName());
      }
      if (StringUtils.isNotBlank(empRemarkinfo.getRemarkDateStr())) {
         queryWrapper.between(EmpRemarkInfo::getRemarkDate, empRemarkinfo.getRemarkDateStr().split(",")[0],
               empRemarkinfo.getRemarkDateStr().split(",")[1]);
      }
        Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }
@@ -48,7 +67,7 @@
    @Override
    public List<EmpRemarkInfo> findEmpRemarkinfos(EmpRemarkInfo empRemarkinfo) {
        LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpRemarkInfo::getDelFlag, 0);
        queryWrapper.eq(EmpRemarkInfo::getDelFlag, empRemarkinfo.getDelFlag());
        return this.baseMapper.selectList(queryWrapper);
    }

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

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