From 3d8f7b941393760faa8fb67af9baa95d5c2c8457 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 二月 2021 17:13:39 +0800
Subject: [PATCH] feat(在职员工): 关闭员工档案接口
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
index 1bfa437..cf9fe77 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -1,6 +1,7 @@
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;
@@ -8,7 +9,6 @@
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.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -19,7 +19,6 @@
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
-import java.util.Date;
import java.util.Map;
/**
@@ -130,13 +129,13 @@
@ApiOperation(value = "关闭员工档案")
@PostMapping("dimission")
- public void dimissionEmp(@RequestParam Map<String, String> mapDimissionInfo) 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");
+ 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(dgryIds, dimissionType, dimissionDate, remark);
+ this.empBaseInfoService.closeEmpArchives(empDimissionLog);
} catch (Exception e) {
String message = "关闭员工档案失败";
log.error(message, e);
--
Gitblit v1.8.0