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
c9b479d5
Commit
c9b479d5
authored
Jun 27, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-合同自动化代码提交
parent
a85a706a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+6
-3
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
c9b479d5
...
...
@@ -731,7 +731,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
TEmployeeContractDateVo
vo
=
new
TEmployeeContractDateVo
();
//合同开始日期、合同截止日期
--
//合同开始日期、合同截止日期
if
(
Common
.
isEmpty
(
employeeContractPreVo
.
getContractStart
())
&&
Common
.
isEmpty
(
employeeContractPreVo
.
getContractEnd
())
&&
Common
.
isEmpty
(
employeeContractPreVo
.
getContractDurationYear
())
...
...
@@ -745,10 +745,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
Common
.
isNotNull
(
info
)
&&
Common
.
isNotNull
(
info
.
getData
()))
{
EkpDeptContractInfoVo
returnVo
=
info
.
getData
();
employeeContractPreVo
.
setContractEnd
(
returnVo
.
getContractEndTime
());
employeeContractPreVo
.
setContractEndType
(
returnVo
.
getContractType
());
}
else
{
employeeContractPreVo
.
setContractEnd
(
null
);
employeeContractPreVo
.
setContractEndType
(
null
);
}
}
//合同年限推算
...
...
@@ -789,9 +787,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
vo
.
setRegistDate
(
employeeContractPreVo
.
getDispatchPeriodStart
());
employeeContractPreVo
.
setDispatchPeriodEnd
(
this
.
addYearsMonths
(
vo
));
}
//实习开始日期、实习结束日期赋值合同开始、截止日期
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getInternshipPeriodStart
()))
{
employeeContractPreVo
.
setContractStart
(
employeeContractPreVo
.
getInternshipPeriodStart
());
}
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getInternshipPeriodEnd
()))
{
employeeContractPreVo
.
setContractEnd
(
employeeContractPreVo
.
getInternshipPeriodEnd
());
}
//实习开始日期、实习结束日期
if
(
Common
.
isEmpty
(
employeeContractPreVo
.
getInternshipPeriodStart
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getInternshipPeriodNum
()))
{
...
...
@@ -801,6 +803,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
vo
.
setYearAfter
(
0
);
vo
.
setRegistDate
(
employeeContractPreVo
.
getInternshipPeriodStart
());
employeeContractPreVo
.
setInternshipPeriodEnd
(
this
.
addYearsMonths
(
vo
));
employeeContractPreVo
.
setContractEnd
(
employeeContractPreVo
.
getInternshipPeriodEnd
());
}
//合同岗位名称
if
(
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getPostType
())
...
...
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