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
e6d8d4e2
Commit
e6d8d4e2
authored
Jun 25, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
29e5020b
e3163515
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
TGzContractServiceImpl.java
...v1/yifu/archives/service/impl/TGzContractServiceImpl.java
+3
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzContractServiceImpl.java
View file @
e6d8d4e2
...
@@ -82,14 +82,15 @@ public class TGzContractServiceImpl implements TGzContractService {
...
@@ -82,14 +82,15 @@ public class TGzContractServiceImpl implements TGzContractService {
// 将Date转换为LocalDate
// 将Date转换为LocalDate
LocalDate
localDate
=
contractInfo
.
getContractStart
().
toInstant
().
atZone
(
ZoneId
.
systemDefault
()).
toLocalDate
();
LocalDate
localDate
=
contractInfo
.
getContractStart
().
toInstant
().
atZone
(
ZoneId
.
systemDefault
()).
toLocalDate
();
LocalDate
prcExpLocalDate
=
localDate
.
plusMonths
(
6
);
// 加上6个月
// 加上6个月减一天
LocalDate
prcExpLocalDate
=
localDate
.
plusMonths
(
6
).
minusDays
(
1
);
// 将LocalDate转换回Date对象
// 将LocalDate转换回Date对象
Date
prcExpDt
=
Date
.
from
(
prcExpLocalDate
.
atStartOfDay
(
ZoneId
.
systemDefault
()).
toInstant
());
Date
prcExpDt
=
Date
.
from
(
prcExpLocalDate
.
atStartOfDay
(
ZoneId
.
systemDefault
()).
toInstant
());
// 试用期预计结束日期
// 试用期预计结束日期
gzEmpInfo
.
setPrcExpDt
(
prcExpDt
);
gzEmpInfo
.
setPrcExpDt
(
prcExpDt
);
// 默认等于试用期预计结束日期+1日(自然日),eg:”试用期预计结束日期“为20251202,”预计转正日期“为20251203“
// 默认等于试用期预计结束日期+1日(自然日),eg:”试用期预计结束日期“为20251202,”预计转正日期“为20251203“
LocalDate
probationDtLocalDate
=
prcExpLocalDate
.
plusDays
(
1
);
// 加上+1日(自然日)
LocalDate
probationDtLocalDate
=
prcExpLocalDate
.
plusDays
(
1
);
// 将LocalDate转换回Date对象
// 将LocalDate转换回Date对象
Date
probationDt
=
Date
.
from
(
probationDtLocalDate
.
atStartOfDay
(
ZoneId
.
systemDefault
()).
toInstant
());
Date
probationDt
=
Date
.
from
(
probationDtLocalDate
.
atStartOfDay
(
ZoneId
.
systemDefault
()).
toInstant
());
// 预计转正日期
// 预计转正日期
...
...
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