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
9cd0e51a
Commit
9cd0e51a
authored
Apr 07, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
确认接收校验整合-fxj
parent
1471a062
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletion
+16
-1
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+7
-1
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+9
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
9cd0e51a
...
@@ -694,7 +694,13 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -694,7 +694,13 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
&&
!
preVo
.
getContractEnd
().
equals
(
preVo
.
getDispatchPeriodEnd
())){
&&
!
preVo
.
getContractEnd
().
equals
(
preVo
.
getDispatchPeriodEnd
())){
errorMessages
.
add
(
"合同截止日期与派遣截止日期不一致"
);
errorMessages
.
add
(
"合同截止日期与派遣截止日期不一致"
);
}
}
//固定期限时 劳务派遣合同需要校验 标准合同的年限和劳务派遣合同的年限一致
if
(
CommonConstants
.
ONE_STRING
.
equals
(
preVo
.
getContractTerm
())){
if
(!
preVo
.
getContractDurationYear
().
equals
(
preVo
.
getDispatchPeriodYear
())
||
!
preVo
.
getContractDurationMonth
().
equals
(
preVo
.
getDispatchPeriodMonth
())){
errorMessages
.
add
(
"劳务派遣合同需要和标准合同一致"
);
}
}
// 如果有错误信息,一起返回
// 如果有错误信息,一起返回
if
(!
errorMessages
.
isEmpty
())
{
if
(!
errorMessages
.
isEmpty
())
{
return
String
.
join
(
";"
,
errorMessages
);
return
String
.
join
(
";"
,
errorMessages
);
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
9cd0e51a
...
@@ -1275,6 +1275,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1275,6 +1275,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
}
}
}
}
}
//固定期限时 劳务派遣合同需要校验 标准合同的年限和劳务派遣合同的年限一致
if
(
"劳务派遣合同"
.
equals
(
employeeContractPreVo
.
getContractType
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractTerm
())){
if
(!
employeeContractPreVo
.
getContractDurationYear
().
equals
(
employeeContractPreVo
.
getDispatchPeriodYear
())
||
!
employeeContractPreVo
.
getContractDurationMonth
().
equals
(
employeeContractPreVo
.
getDispatchPeriodMonth
())){
allErrorMessages
.
add
(
"劳务派遣合同需要和标准合同一致"
);
}
}
}
// 校验合同有效期:合同截止日期不得早于合同开始日期
// 校验合同有效期:合同截止日期不得早于合同开始日期
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getContractStart
())
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getContractStart
())
...
...
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