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
a1922052
Commit
a1922052
authored
Jul 05, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
employee.setLeaveTime(LocalDateTime.now());
parent
787ca643
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
4 deletions
+20
-4
TEmployeeInfo.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
+5
-0
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+5
-4
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+10
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
View file @
a1922052
...
...
@@ -307,29 +307,34 @@ public class TEmployeeInfo extends BaseEntity {
* 减档操作人id
*/
@Schema
(
description
=
"减档操作人id"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
leaveUser
;
/**
* 减档操作人姓名
*/
@Schema
(
description
=
"离职操作姓名"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
leaveUserName
;
/**
* 离职时间
*/
@Schema
(
description
=
"离职时间"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
LocalDateTime
leaveTime
;
/**
* 离职原因
*/
@Schema
(
description
=
"离职原因"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
leaveReason
;
/**
* 离职备注
*/
@Schema
(
description
=
"离职备注"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
leaveRemark
;
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
a1922052
...
...
@@ -16,10 +16,7 @@
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -110,24 +107,28 @@ public class TEmployeeProject extends BaseEntity {
* 减项操作人id
*/
@Schema
(
description
=
"减项操作人id"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
leaveUser
;
/**
* 减项时间
*/
@Schema
(
description
=
"减项时间"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
LocalDateTime
leaveTime
;
/**
* 减项原因
*/
@Schema
(
description
=
"减项原因"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
leaveReason
;
/**
* 减项备注
*/
@Schema
(
description
=
"减项备注"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
leaveRemark
;
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
a1922052
...
...
@@ -308,6 +308,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
for
(
String
pid
:
idArr
)
{
for
(
TEmployeeProject
project
:
projectList
)
{
if
(
project
.
getId
().
equals
(
pid
))
{
project
.
setLeaveReason
(
""
);
project
.
setLeaveRemark
(
""
);
project
.
setLeaveUser
(
""
);
project
.
setLeaveTime
(
null
);
project
.
setProjectStatus
(
CommonConstants
.
ZERO_INT
);
tEmployeeProjectService
.
updateById
(
project
);
}
...
...
@@ -316,6 +320,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
employee
.
setFileStatus
(
CommonConstants
.
ZERO_INT
);
employee
.
setLeaveReason
(
""
);
employee
.
setLeaveRemark
(
""
);
employee
.
setLeaveUser
(
""
);
employee
.
setLeaveTime
(
null
);
this
.
updateById
(
employee
);
// 记录变更日志
...
...
@@ -409,6 +417,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
employee
.
setFileStatus
(
CommonConstants
.
ONE_INT
);
employee
.
setLeaveUser
(
user
.
getId
());
employee
.
setLeaveUserName
(
user
.
getNickname
());
employee
.
setLeaveTime
(
LocalDateTime
.
now
());
employee
.
setLeaveReason
(
excel
.
getLeaveReason
());
employee
.
setLeaveRemark
(
excel
.
getLeaveRemark
());
canDeleteList
.
add
(
employee
);
...
...
@@ -455,6 +464,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
employee
.
setFileStatus
(
CommonConstants
.
ONE_INT
);
employee
.
setLeaveUser
(
user
.
getId
());
employee
.
setLeaveUserName
(
user
.
getNickname
());
employee
.
setLeaveTime
(
LocalDateTime
.
now
());
employee
.
setLeaveReason
(
leaveReason
);
employee
.
setLeaveRemark
(
leaveRemark
);
this
.
updateById
(
employee
);
...
...
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