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
7cc60149
Commit
7cc60149
authored
Apr 09, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提示语优化-fxj
parent
5a2f3048
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+8
-7
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
7cc60149
...
...
@@ -640,13 +640,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
}
if
(
CommonConstants
.
TWENTY_STRING
.
equals
(
preVo
.
getContractType
())){
if
(
Common
.
isNotNull
(
preVo
.
getDispatchPeriodMonth
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodYear
()))
{
vo
=
new
TEmployeeContractDateVo
();
vo
.
setMonthAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
preVo
.
getDispatchPeriodMonth
())
?
"0"
:
preVo
.
getDispatchPeriodMonth
()));
vo
.
setYearAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
preVo
.
getDispatchPeriodYear
())
?
"0"
:
preVo
.
getDispatchPeriodYear
()));
vo
.
setRegistDate
(
preVo
.
getDispatchPeriodStart
());
preVo
.
setDispatchPeriodEnd
(
this
.
addYearsMonths
(
vo
));
}
//处理务派遣合同: 先看上一份合同是否为劳务协议,如果是取值上一份合同的劳务协议结束日期
Date
initDate
=
contract
.
getContractEnd
();
if
(
Common
.
isNotNull
(
contract
.
getPreNewId
())){
...
...
@@ -665,6 +659,13 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
}
preVo
.
setDispatchPeriodStart
(
DateUtil
.
addDayByDate
(
initDate
,
1
));
if
(
Common
.
isNotNull
(
preVo
.
getDispatchPeriodMonth
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodYear
()))
{
vo
=
new
TEmployeeContractDateVo
();
vo
.
setMonthAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
preVo
.
getDispatchPeriodMonth
())
?
"0"
:
preVo
.
getDispatchPeriodMonth
()));
vo
.
setYearAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
preVo
.
getDispatchPeriodYear
())
?
"0"
:
preVo
.
getDispatchPeriodYear
()));
vo
.
setRegistDate
(
preVo
.
getDispatchPeriodStart
());
preVo
.
setDispatchPeriodEnd
(
this
.
addYearsMonths
(
vo
));
}
List
<
String
>
errorMessages
=
new
ArrayList
<>();
if
(
Common
.
isNotNull
(
preVo
.
getContractDurationYear
())
...
...
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