Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
5fe7354a
Commit
5fe7354a
authored
Mar 04, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.7-CSP入离职的日志+处理
parent
93bfe73e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
1 deletion
+20
-1
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+10
-0
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+10
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
5fe7354a
...
@@ -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
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
5fe7354a
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment