Commit 5fe7354a authored by hongguangwu's avatar hongguangwu

MVP1.7.7-CSP入离职的日志+处理

parent 93bfe73e
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
*/ */
package com.yifu.cloud.plus.v1.yifu.archives.entity; package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
...@@ -24,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; ...@@ -24,6 +25,7 @@ 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;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
...@@ -425,4 +427,12 @@ public class TEmployeeProject extends BaseEntity { ...@@ -425,4 +427,12 @@ public class TEmployeeProject extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private LocalDateTime createTimeEnd; private LocalDateTime createTimeEnd;
@Schema(description = "所属部门名称")
@TableField(exist = false)
private String empDeptname;
@Schema(description = "所属部门id")
@TableField(exist = false)
private String empDeptid;
} }
...@@ -1375,7 +1375,16 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1375,7 +1375,16 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
project.setProjectStatus(CommonConstants.ZERO_INT); project.setProjectStatus(CommonConstants.ZERO_INT);
} }
project.setDeleteFlag(CommonConstants.STATUS_NORMAL); project.setDeleteFlag(CommonConstants.STATUS_NORMAL);
return this.list(Wrappers.query(project)); List<TEmployeeProject> projectList = this.list(Wrappers.query(project));
TEmployeeProjectBelongDept dept;
for (TEmployeeProject employeeProject : projectList) {
dept = tEmployeeProjectBelongDeptService.getById(employeeProject.getId());
if (dept != null) {
employeeProject.setEmpDeptid(dept.getEmpDeptid());
employeeProject.setEmpDeptname(dept.getEmpDeptname());
}
}
return projectList;
} }
@Override @Override
......
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