Merge remote-tracking branch 'origin/master'

Alan

2021-02-19 63de9a0489ad9264fcd62dc0ac8791a6ec33874b

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

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

import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
@@ -122,22 +121,6 @@
            this.empBaseInfoService.momentToNormal(ids);
        } catch (Exception e) {
            String message = "基本信息提交失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }

    @ApiOperation(value = "关闭员工档案")
    @PostMapping("dimission")
    public void dimissionEmp(EmpDimissionLog empDimissionLog) throws FebsException {
        // String dgryIds = mapDimissionInfo.get("dgryIds");
        // String dimissionType = mapDimissionInfo.get("dimissionType");
        // String remark = mapDimissionInfo.get("remark");
        // Date dimissionDate = DateUtil.parse(mapDimissionInfo.get("dimissionDate").toString(),"yyyy-MM-dd");
        try {
            this.empBaseInfoService.closeEmpArchives(empDimissionLog);
        } catch (Exception e) {
            String message = "关闭员工档案失败";
            log.error(message, e);
            throw new FebsException(message);
        }