Merge remote-tracking branch 'origin/master'

yz

2021-03-09 dfed60326c07756d3710d74c3aa44b537602adda

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

@@ -1,11 +1,16 @@
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.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
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;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +19,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import java.util.List;
import java.util.Map;

/**
@@ -50,6 +57,15 @@
        return new FebsResponse().data(dataTable);
    }

    @ApiOperation(value = "导出员工")
    @RequestMapping(value = "export", method = RequestMethod.POST)
    @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
    public void export(QueryRequest request, EmpResign empBaseinfo, HttpServletResponse response) {
        request.setPageSize(this.empResignService.count());
        List<EmpResign> records = this.empResignService.findEmpResigns(request, empBaseinfo).getRecords();
        ExcelKit.$Export(EmpResign.class, response).downXlsx(records, false);
    }

    @PostMapping
    @PreAuthorize("hasAuthority('empResign:add')")
    public void addEmpResign(@Valid EmpResign empResign) throws FebsException {
@@ -57,6 +73,9 @@
            this.empResignService.createEmpResign(empResign);
        } catch (Exception e) {
            String message = "新增员工辞职申请失败";
            if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }
@@ -93,6 +112,9 @@
            this.empResignService.updateEmpResign(empResign);
        } catch (Exception e) {
            String message = "修改员工辞职申请失败";
            if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }