修改bug

yz_08

2021-02-26 ecad6bdfc3a547d8aa4ae80aec4f060c10e442e0

修改bug

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

@@ -24,7 +24,6 @@
import java.util.Map;

/**
*
* name:EmpInsurance
* package:cc.mrbird.febs.server.hr.controller
* description:员工社保申请控制器
@@ -55,6 +54,7 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empInsuranceService.findEmpInsurances(request, empInsurance));
return new FebsResponse().data(dataTable);
}

    @ApiOperation(value = "导出员工")
    @RequestMapping(value = "export",method= RequestMethod.POST)
    @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
@@ -63,6 +63,7 @@
        List<EmpInsurance> records = this.empInsuranceService.findEmpInsurances(request, empBaseinfo).getRecords();
        ExcelKit.$Export(EmpInsurance.class, response).downXlsx(records, false);
    }

@PostMapping
@PreAuthorize("hasAuthority('empInsurance:add')")
public void addEmpInsurance(@Valid EmpInsurance empInsurance) throws FebsException {

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpInsuranceService.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.EmpInsurance;

import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -40,14 +41,14 @@
     *
     * @param empInsurance empInsurance
     */
    void createEmpInsurance(EmpInsurance empInsurance);
    void createEmpInsurance(EmpInsurance empInsurance) throws FebsException;

    /**
     * 修改
     *
     * @param empInsurance empInsurance
     */
    void updateEmpInsurance(EmpInsurance empInsurance);
    void updateEmpInsurance(EmpInsurance empInsurance) throws FebsException;

    /**
     * 删除

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

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

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
@@ -88,7 +89,14 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpInsurance(EmpInsurance empInsurance) {
    public void createEmpInsurance(EmpInsurance empInsurance) throws FebsException {
        LambdaQueryWrapper<EmpInsurance> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpInsurance::getEmpId, empInsurance.getEmpId());
        lambdaQueryWrapper.eq(EmpInsurance::getApplayDate, empInsurance.getApplayDate());
        lambdaQueryWrapper.eq(EmpInsurance::getDelFlag, 0);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("此人已在本日期申请过社保");
        }
        empInsurance.setInsuranceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empInsurance.setCreator(operatorId);
        empInsurance.setModifier(operatorId);
@@ -97,7 +105,15 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpInsurance(EmpInsurance empInsurance) {
    public void updateEmpInsurance(EmpInsurance empInsurance) throws FebsException {
        LambdaQueryWrapper<EmpInsurance> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpInsurance::getEmpId, empInsurance.getEmpId());
        lambdaQueryWrapper.eq(EmpInsurance::getApplayDate, empInsurance.getApplayDate());
        lambdaQueryWrapper.eq(EmpInsurance::getDelFlag, 0);
        lambdaQueryWrapper.ne(EmpInsurance::getInsuranceId,empInsurance.getInsuranceId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("此人已在本日期申请过社保");
        }
        EmpInsurance dbData = this.getById(empInsurance.getInsuranceId());
        empInsurance.setCreateTime(dbData.getCreateTime());
        empInsurance.setCreator(dbData.getCreator());