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
a55cde94
Commit
a55cde94
authored
Mar 13, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同续签优化-fxj
parent
64c39899
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
207 additions
and
9 deletions
+207
-9
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+26
-1
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+181
-8
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
a55cde94
...
@@ -633,7 +633,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -633,7 +633,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
}
}
}
if
(
CommonConstants
.
TWENTY_STRING
.
equals
(
preVo
.
getContractType
())){
if
(
CommonConstants
.
TWENTY_STRING
.
equals
(
preVo
.
getContractType
())){
//处理
劳务协议
: 先看上一份合同是否为劳务协议,如果是取值上一份合同的劳务协议结束日期
//处理
务派遣合同
: 先看上一份合同是否为劳务协议,如果是取值上一份合同的劳务协议结束日期
Date
initDate
=
contract
.
getContractEnd
();
Date
initDate
=
contract
.
getContractEnd
();
if
(
Common
.
isNotNull
(
contract
.
getPreNewId
())){
if
(
Common
.
isNotNull
(
contract
.
getPreNewId
())){
TEmployeeContractPreNew
preNew
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPreNew
>
query
().
lambda
()
TEmployeeContractPreNew
preNew
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPreNew
>
query
().
lambda
()
...
@@ -652,6 +652,22 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -652,6 +652,22 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
}
preVo
.
setDispatchPeriodStart
(
DateUtil
.
addDayByDate
(
initDate
,
1
));
preVo
.
setDispatchPeriodStart
(
DateUtil
.
addDayByDate
(
initDate
,
1
));
if
(
Common
.
isNotNull
(
preVo
.
getDispatchPeriodYear
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodMonth
())){
if
(
Common
.
isNotNull
(
preVo
.
getDispatchPeriodYear
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodMonth
())){
//校验劳务派遣的派遣年限必须为两年
final
int
REQUIRED_SERVICE_YEARS
=
2
;
int
year
=
0
;
try
{
year
=
Integer
.
parseInt
(
Common
.
isEmpty
(
preVo
.
getDispatchPeriodYear
())
?
"0"
:
preVo
.
getDispatchPeriodYear
().
trim
());
}
catch
(
NumberFormatException
e
)
{
return
"劳务派遣的派遣年限格式不正确"
;
}
String
dispatchMonth
=
preVo
.
getDispatchPeriodMonth
();
if
(
"12"
.
equals
(
dispatchMonth
))
{
year
=
year
+
1
;
}
if
(
year
<
REQUIRED_SERVICE_YEARS
)
{
return
"劳务派遣合同的合同年限不能小于2年,请检查"
;
}
vo
=
new
TEmployeeContractDateVo
();
vo
=
new
TEmployeeContractDateVo
();
vo
.
setMonthAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
preVo
.
getDispatchPeriodMonth
())
?
"0"
:
preVo
.
getDispatchPeriodMonth
()));
vo
.
setMonthAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
preVo
.
getDispatchPeriodMonth
())
?
"0"
:
preVo
.
getDispatchPeriodMonth
()));
vo
.
setYearAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
preVo
.
getDispatchPeriodYear
())
?
"0"
:
preVo
.
getDispatchPeriodYear
()));
vo
.
setYearAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
preVo
.
getDispatchPeriodYear
())
?
"0"
:
preVo
.
getDispatchPeriodYear
()));
...
@@ -663,6 +679,15 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -663,6 +679,15 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
return
"派遣结束日期需大于等于派遣开始日期"
;
return
"派遣结束日期需大于等于派遣开始日期"
;
}
}
}
}
//合同开始时间、合同截止时间 与派遣的合同开始时间、合同截止时间一致
if
(
Common
.
isNotNull
(
preVo
.
getContractStart
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodStart
())
&&
!
preVo
.
getContractStart
().
equals
(
preVo
.
getDispatchPeriodStart
())){
return
"合同开始日期与派遣开始日期不一致"
;
}
if
(
Common
.
isNotNull
(
preVo
.
getContractEnd
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodEnd
())
&&
!
preVo
.
getContractEnd
().
equals
(
preVo
.
getDispatchPeriodEnd
())){
return
"合同截止日期与派遣截止日期不一致"
;
}
}
}
//同商务合同一直 要 验证时间 截止时间大于等于开始时间、时间交叉
//同商务合同一直 要 验证时间 截止时间大于等于开始时间、时间交叉
if
(
Common
.
isNotNull
(
preVo
.
getContractStart
())
&&
Common
.
isNotNull
(
preVo
.
getContractEnd
())){
if
(
Common
.
isNotNull
(
preVo
.
getContractStart
())
&&
Common
.
isNotNull
(
preVo
.
getContractEnd
())){
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
a55cde94
This diff is collapsed.
Click to expand it.
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