Merge branch 'lybDevelop'

luoyb

2021-02-20 bedc1792239e77a46936bf9b175e324d57113bfe

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

@@ -1,22 +1,29 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpOccupational;
import cc.mrbird.febs.server.hr.mapper.EmpOccupationalMapper;
import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Optional;

import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
import org.springframework.transaction.annotation.Transactional;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;

import java.util.*;
import cc.mrbird.febs.server.hr.entity.EmpOccupational;
import cc.mrbird.febs.server.hr.mapper.EmpOccupationalMapper;
import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
import lombok.RequiredArgsConstructor;

/**
 * name:EmpOccupational
@@ -40,7 +47,36 @@
    @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());
        if (StringUtils.isNotBlank(empOccupational.getEmpNumb())) {
         queryWrapper.like(EmpOccupational::getEmpNumb, empOccupational.getEmpNumb());
      }
      if (StringUtils.isNotBlank(empOccupational.getEmpName())) {
         queryWrapper.like(EmpOccupational::getEmpName, empOccupational.getEmpName());
      }
      if (StringUtils.isNotBlank(empOccupational.getCertificateNumb())) {
         queryWrapper.like(EmpOccupational::getCertificateNumb, empOccupational.getCertificateNumb());
      }
      if (StringUtils.isNotBlank(empOccupational.getDeptName())) {
         queryWrapper.like(EmpOccupational::getDeptName, empOccupational.getDeptName());
      }
      if (StringUtils.isNotBlank(empOccupational.getInjuredTimeStr())) {
         queryWrapper.between(EmpOccupational::getInjuredTime, empOccupational.getInjuredTimeStr().split(",")[0],
               empOccupational.getInjuredTimeStr().split(",")[1]);
      }
      if (StringUtils.isNotBlank(empOccupational.getHrDoDateStr())) {
         queryWrapper.between(EmpOccupational::getHrDoDate, empOccupational.getHrDoDateStr().split(",")[0],
               empOccupational.getHrDoDateStr().split(",")[1]);
      }
      if (empOccupational.getHospitalizatioFlag() != null && empOccupational.getHospitalizatioFlag() != 0) {
         queryWrapper.eq(EmpOccupational::getHospitalizatioFlag, empOccupational.getHospitalizatioFlag());
      }
      if (empOccupational.getSettleStatus() != null && empOccupational.getSettleStatus() != 0) {
         queryWrapper.eq(EmpOccupational::getSettleStatus, empOccupational.getSettleStatus());
      }
      if (StringUtils.isNotBlank(empOccupational.getEmpStatus())) {
         queryWrapper.eq(EmpOccupational::getEmpStatus, empOccupational.getEmpStatus());
      }
        Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
    }
@@ -48,7 +84,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 +92,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 +142,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;
    }
}