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
e56ee6b9
Commit
e56ee6b9
authored
Jun 20, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-合同自动化代码提交
parent
e5372798
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+5
-1
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
e56ee6b9
...
...
@@ -783,7 +783,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
employeeContractPreVo
.
setDispatchPeriodEnd
(
this
.
addYearsMonths
(
vo
));
}
//实习开始日期、实习结束日期
//实习开始日期、实习结束日期
if
(
Common
.
isEmpty
(
employeeContractPreVo
.
getInternshipPeriodStart
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getInternshipPeriodNum
()))
{
employeeContractPreVo
.
setInternshipPeriodStart
(
employeeContractPreVo
.
getJoinLeaveDate
());
...
...
@@ -792,6 +791,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
vo
.
setRegistDate
(
employeeContractPreVo
.
getInternshipPeriodStart
());
employeeContractPreVo
.
setInternshipPeriodEnd
(
this
.
addYearsMonths
(
vo
));
}
//合同岗位名称
if
(
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getPostType
())
&&
Common
.
isEmpty
(
employeeContractPreVo
.
getPost
()))
{
employeeContractPreVo
.
setPost
(
registration
.
getPosition
());
}
// 预计提醒时间、预计合同发起时间
employeeContractPreVo
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
employeeContractPreVo
.
getExpectedCollectionTime
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
" 9:00"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
...
...
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