Commit a1922052 authored by hongguangwu's avatar hongguangwu

employee.setLeaveTime(LocalDateTime.now());

parent 787ca643
...@@ -307,29 +307,34 @@ public class TEmployeeInfo extends BaseEntity { ...@@ -307,29 +307,34 @@ public class TEmployeeInfo extends BaseEntity {
* 减档操作人id * 减档操作人id
*/ */
@Schema(description = "减档操作人id") @Schema(description = "减档操作人id")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String leaveUser; private String leaveUser;
/** /**
* 减档操作人姓名 * 减档操作人姓名
*/ */
@Schema(description = "离职操作姓名") @Schema(description = "离职操作姓名")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String leaveUserName; private String leaveUserName;
/** /**
* 离职时间 * 离职时间
*/ */
@Schema(description = "离职时间") @Schema(description = "离职时间")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime leaveTime; private LocalDateTime leaveTime;
/** /**
* 离职原因 * 离职原因
*/ */
@Schema(description = "离职原因") @Schema(description = "离职原因")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String leaveReason; private String leaveReason;
/** /**
* 离职备注 * 离职备注
*/ */
@Schema(description = "离职备注") @Schema(description = "离职备注")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String leaveRemark; private String leaveRemark;
/** /**
......
...@@ -16,10 +16,7 @@ ...@@ -16,10 +16,7 @@
*/ */
package com.yifu.cloud.plus.v1.yifu.archives.entity; package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
...@@ -110,24 +107,28 @@ public class TEmployeeProject extends BaseEntity { ...@@ -110,24 +107,28 @@ public class TEmployeeProject extends BaseEntity {
* 减项操作人id * 减项操作人id
*/ */
@Schema(description ="减项操作人id") @Schema(description ="减项操作人id")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String leaveUser; private String leaveUser;
/** /**
* 减项时间 * 减项时间
*/ */
@Schema(description ="减项时间") @Schema(description ="减项时间")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime leaveTime; private LocalDateTime leaveTime;
/** /**
* 减项原因 * 减项原因
*/ */
@Schema(description ="减项原因") @Schema(description ="减项原因")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String leaveReason; private String leaveReason;
/** /**
* 减项备注 * 减项备注
*/ */
@Schema(description ="减项备注") @Schema(description ="减项备注")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String leaveRemark; private String leaveRemark;
/** /**
......
...@@ -308,6 +308,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -308,6 +308,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
for (String pid : idArr) { for (String pid : idArr) {
for (TEmployeeProject project : projectList) { for (TEmployeeProject project : projectList) {
if (project.getId().equals(pid)) { if (project.getId().equals(pid)) {
project.setLeaveReason("");
project.setLeaveRemark("");
project.setLeaveUser("");
project.setLeaveTime(null);
project.setProjectStatus(CommonConstants.ZERO_INT); project.setProjectStatus(CommonConstants.ZERO_INT);
tEmployeeProjectService.updateById(project); tEmployeeProjectService.updateById(project);
} }
...@@ -316,6 +320,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -316,6 +320,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} }
} }
employee.setFileStatus(CommonConstants.ZERO_INT); employee.setFileStatus(CommonConstants.ZERO_INT);
employee.setLeaveReason("");
employee.setLeaveRemark("");
employee.setLeaveUser("");
employee.setLeaveTime(null);
this.updateById(employee); this.updateById(employee);
// 记录变更日志 // 记录变更日志
...@@ -409,6 +417,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -409,6 +417,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
employee.setFileStatus(CommonConstants.ONE_INT); employee.setFileStatus(CommonConstants.ONE_INT);
employee.setLeaveUser(user.getId()); employee.setLeaveUser(user.getId());
employee.setLeaveUserName(user.getNickname()); employee.setLeaveUserName(user.getNickname());
employee.setLeaveTime(LocalDateTime.now());
employee.setLeaveReason(excel.getLeaveReason()); employee.setLeaveReason(excel.getLeaveReason());
employee.setLeaveRemark(excel.getLeaveRemark()); employee.setLeaveRemark(excel.getLeaveRemark());
canDeleteList.add(employee); canDeleteList.add(employee);
...@@ -455,6 +464,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -455,6 +464,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
employee.setFileStatus(CommonConstants.ONE_INT); employee.setFileStatus(CommonConstants.ONE_INT);
employee.setLeaveUser(user.getId()); employee.setLeaveUser(user.getId());
employee.setLeaveUserName(user.getNickname()); employee.setLeaveUserName(user.getNickname());
employee.setLeaveTime(LocalDateTime.now());
employee.setLeaveReason(leaveReason); employee.setLeaveReason(leaveReason);
employee.setLeaveRemark(leaveRemark); employee.setLeaveRemark(leaveRemark);
this.updateById(employee); this.updateById(employee);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment