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
7a3047be
Commit
7a3047be
authored
Nov 26, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.17-离职待办-优化代码
parent
c5d9f242
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+12
-0
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
7a3047be
...
@@ -1087,6 +1087,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1087,6 +1087,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
vo
.
setReasonType
(
leave
.
getLeaveReasonId
());
vo
.
setReasonType
(
leave
.
getLeaveReasonId
());
vo
.
setTrustRemark
(
leave
.
getSocialTrustRemark
());
vo
.
setTrustRemark
(
leave
.
getSocialTrustRemark
());
vo
.
setChangeContractAndEmployee
(
CommonConstants
.
ONE_STRING
);
vo
.
setChangeContractAndEmployee
(
CommonConstants
.
ONE_STRING
);
if
(
Common
.
isNotNull
(
leave
.
getJoinLeaveDate
()))
{
try
{
vo
.
setLeaveDate
(
DateUtil
.
parseDate
(
leave
.
getJoinLeaveDate
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
));
}
catch
(
Exception
e
)
{
}
}
socialOldList
.
add
(
vo
);
socialOldList
.
add
(
vo
);
}
}
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
TWO_STRING
))
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
TWO_STRING
))
...
@@ -1109,6 +1115,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1109,6 +1115,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
vo
.
setReasonType
(
leave
.
getLeaveReasonId
());
vo
.
setReasonType
(
leave
.
getLeaveReasonId
());
vo
.
setTrustRemark
(
leave
.
getFundTrustRemark
());
vo
.
setTrustRemark
(
leave
.
getFundTrustRemark
());
vo
.
setChangeContractAndEmployee
(
CommonConstants
.
ONE_STRING
);
vo
.
setChangeContractAndEmployee
(
CommonConstants
.
ONE_STRING
);
if
(
Common
.
isNotNull
(
leave
.
getJoinLeaveDate
()))
{
try
{
vo
.
setLeaveDate
(
DateUtil
.
parseDate
(
leave
.
getJoinLeaveDate
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
));
}
catch
(
Exception
e
)
{
}
}
fundOldList
.
add
(
vo
);
fundOldList
.
add
(
vo
);
}
}
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
THREE_STRING
))
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
THREE_STRING
))
...
...
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