完善员工智搜

yijiusmile

2021-02-17 cea0deacb7c614918d213fe3a18c9fa1abf09dc8

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

@@ -40,7 +40,7 @@
    @Override
    public IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational) {
        LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpOccupational::getDelFlag, 0);
        queryWrapper.eq(EmpOccupational::getDelFlag, empOccupational.getDelFlag());
        Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }
@@ -48,7 +48,7 @@
    @Override
    public List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational) {
        LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpOccupational::getDelFlag, 0);
        queryWrapper.eq(EmpOccupational::getDelFlag, empOccupational.getDelFlag());
        return this.baseMapper.selectList(queryWrapper);
    }

@@ -56,6 +56,15 @@
    @Transactional(rollbackFor = Exception.class)
    public void createEmpOccupational(EmpOccupational empOccupational) {
        empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        if(empOccupational.getSubmitTime()==null){
            empOccupational.setSubmitTime(empOccupational.getInjuredTime());
        }
        if(empOccupational.getReportTime()==null){
            empOccupational.setReportTime(empOccupational.getInjuredTime());
        }
        if(empOccupational.getHrDoDate()==null){
            empOccupational.setHrDoDate(empOccupational.getInjuredTime());
        }
        empOccupational.setCreator(operatorId);
        empOccupational.setModifier(operatorId);
        this.save(empOccupational);
@@ -97,4 +106,11 @@
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empOccupationalMapper.logicDeleteByIds(list, operatorId);
    }

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