fix: 导入新员工时也同步写一条入职记录

luoyb

2021-07-30 65f1296728ac4a2c207d411b50659af683628413

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.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.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
@@ -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;
@@ -54,14 +56,16 @@
        Map<String, Object> dataTable = FebsUtil.getDataTable(this.empResignService.findEmpResigns(request, empResign));
        return new FebsResponse().data(dataTable);
    }

    @ApiOperation(value = "导出员工")
    @RequestMapping(value = "export",method= RequestMethod.POST)
    @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 {
@@ -69,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);
        }
@@ -87,7 +94,6 @@
    }

    @DeleteMapping("{ids}")
    @PreAuthorize("hasAuthority('empResign:delete')")
    public void logicDeleteEmpResign(@PathVariable("ids") String ids) throws FebsException {
        try {
            this.empResignService.logicDelEmpResign(ids);
@@ -105,6 +111,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);
        }