Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-04 cfce5a0402f09b7f7891f045a77b8a9ceea69e1f

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.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.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import cc.mrbird.febs.server.hr.service.IEmpUnemploymentService;
@@ -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;
@@ -58,7 +60,7 @@
    @RequestMapping(value = "export",method= RequestMethod.POST)
    @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
    public void export(QueryRequest request, EmpUnemployment empBaseinfo, HttpServletResponse response) {

        request.setPageSize(this.empUnemploymentService.count());
        List<EmpUnemployment> records = this.empUnemploymentService.findEmpUnemployments(request, empBaseinfo).getRecords();
        ExcelKit.$Export(EmpUnemployment.class, response).downXlsx(records, false);
    }
@@ -69,6 +71,9 @@
            this.empUnemploymentService.createEmpUnemployment(empUnemployment);
        } catch (Exception e) {
            String message = "新增失业金领取表失败";
            if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }
@@ -105,6 +110,9 @@
            this.empUnemploymentService.updateEmpUnemployment(empUnemployment);
        } catch (Exception e) {
            String message = "修改失业金领取表失败";
            if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }