feat(分支合并): 附件管理

luoyb

2021-02-19 d48f137e71193bd8b3bb39570eca666798fda070

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

@@ -3,9 +3,12 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
import cc.mrbird.febs.server.hr.mapper.EmpWorkExperienceMapper;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;

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,19 @@
    @Override
    public IPage<EmpWorkExperience> findEmpWorkExperiences(QueryRequest request, EmpWorkExperience empWorkexperience) {
        LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpWorkExperience::getDelFlag, 0);
        queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
        if (StringUtils.isNotBlank(empWorkexperience.getEmpNumb())) {
            queryWrapper.like(EmpWorkExperience::getEmpNumb, empWorkexperience.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empWorkexperience.getEmpName())) {
            queryWrapper.like(EmpWorkExperience::getEmpName, empWorkexperience.getEmpName());
        }
        if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
            queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
            queryWrapper.eq(EmpWorkExperience::getEmpStatus, empWorkexperience.getEmpStatus());
        }
        Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }
@@ -48,7 +63,7 @@
    @Override
    public List<EmpWorkExperience> findEmpWorkExperiences(EmpWorkExperience empWorkexperience) {
        LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpWorkExperience::getDelFlag, 0);
        queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
        return this.baseMapper.selectList(queryWrapper);
    }

@@ -100,4 +115,11 @@
        list.addAll(Arrays.asList(str));
        empWorkexperienceMapper.logicDeleteByIds(list, operatorId);
    }

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