fix(bug修复): 基本信息录入

luoyb

2021-03-06 5e242cc2caa9b9c2b210e894bc737518fb67d085

fix(bug修复): 基本信息录入

1.意外险案件同一受伤时间只能有一条记录
2.工伤案件增加了同样的判断

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java

@@ -1,6 +1,7 @@
package cc.mrbird.febs.server.hr.controller;

import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import cc.mrbird.febs.server.hr.entity.EmpOccupational;
import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
@@ -8,6 +9,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cn.hutool.core.util.StrUtil;
import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -69,6 +71,9 @@
            this.empOccupationalService.createEmpOccupational(empOccupational);
        } catch (Exception e) {
            String message = "新增员工工伤案件失败";
            if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }

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

@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service;

import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.entity.EmpOccupational;

import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -40,7 +41,7 @@
     *
     * @param empOccupational empOccupational
     */
    void createEmpOccupational(EmpOccupational empOccupational);
    void createEmpOccupational(EmpOccupational empOccupational) throws FebsException;

    /**
     * 修改

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

@@ -111,7 +111,7 @@
    public void createEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException {
        LambdaQueryWrapper<EmpAccidentCases> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpAccidentCases::getEmpId, empAccidentcases.getEmpId());
        lambdaQueryWrapper.eq(EmpAccidentCases::getHrDoDate, empAccidentcases.getHrDoDate());
        lambdaQueryWrapper.eq(EmpAccidentCases::getInjuredTime, empAccidentcases.getInjuredTime());
        lambdaQueryWrapper.ne(EmpAccidentCases::getDelFlag,1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);

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

@@ -7,6 +7,9 @@
import java.util.List;
import java.util.Optional;

import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cn.hutool.core.util.StrUtil;
@@ -105,7 +108,15 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpOccupational(EmpOccupational empOccupational) {
    public void createEmpOccupational(EmpOccupational empOccupational) throws FebsException {
        LambdaQueryWrapper<EmpOccupational> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpOccupational::getEmpId, empOccupational.getEmpId());
        lambdaQueryWrapper.eq(EmpOccupational::getInjuredTime, empOccupational.getInjuredTime());
        lambdaQueryWrapper.ne(EmpOccupational::getDelFlag,1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }

        empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        if(empOccupational.getSubmitTime()==null){
            empOccupational.setSubmitTime(empOccupational.getInjuredTime());